Rollback des SSL, weils nen netten Fehler mit dem SSH gibt.

Und noch das komische resetusb geloescht, was keine Funktion mehr besitzt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@686 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index a2be304b7d43b4234dcc5cde289c47dc8c08b6ca..c0c24f726c089e4cd530cc25917547ad2b98ab23 100644 (file)
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -21,15 +21,12 @@
 #
 ###############
 
-# Version
-my $VERSION = '1.0';
-
 use strict;
 use IPC::Open2;
 use IO::Handle;
 
 # define here your redirectors (use a comma sperated list)
-my $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator', ];
+my $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];
 
 # Attention: keep in mind that the order of your redirectors is important.
 # It doesn't make sense to scan for viruses on pages you restrict access to...

diff --git a/lfs/openssl b/lfs/openssl
index fdcb386b7fa4f662e48d98e2d98f7678d8c87c7d..6e6ba41d764f2ad4bf31e149f6e6790b39dd06bc 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 0.9.8e
+VER        = 0.9.8d
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3a7ff24f6ea5cd711984722ad654b927
+$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
 
 install : $(TARGET)
 
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf /etc/ssl
        cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
        cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8d-fix_manpages-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
        cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
        cd $(DIR_APP) && make MANDIR=/usr/share/man
        cd $(DIR_APP) && make MANDIR=/usr/share/man install

diff --git a/src/scripts/resetusb b/src/scripts/resetusb
deleted file mode 100644 (file)
index cb35517..0000000
--- a/src/scripts/resetusb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-#
-
-aliases=`/sbin/modprobe -c | awk '/^alias usb-controller/ { print $3 }'`
-if [ -n "$aliases" -a "$aliases" != "off" ] ; then
-       for alias in $aliases ; do
-               [ "$alias" != "off" ] && /sbin/modprobe -r $alias
-       done
-       /bin/sleep 2
-       for alias in $aliases ; do
-               [ "$alias" != "off" ] && /sbin/modprobe $alias
-       done
-fi
-/bin/sleep 6