Menu
▾
▴
[Devil-linux-commit] build/scripts strongswan, NONE, 1.1.2.1 curl, 1.1.2.1, 1.1.2.2 linux, 1.54.2.1, 1.54.2.2 openldap, 1.20.2.2, 1.20.2.3 patch-o-matic, 1.22.2.11, 1.22.2.12 super-freeswan, 1.8.4.4, NONE
|
From: Heiko Z. <smi...@us...> - 2007-08-19 14:03:00
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv25918/scripts Modified Files: Tag: rel-1-2-patches curl linux openldap patch-o-matic Added Files: Tag: rel-1-2-patches strongswan Removed Files: Tag: rel-1-2-patches super-freeswan Log Message: - added TLS support to openldap - updated openldap to 2.3.37 - updated Mail-SpamAssassin to 3.2.3 - updated cdrtools to 2.01.01a32 - updated clamav to 0.91.1 - updated curl to 7.16.4 - updated dovecot to 1.0.3 - updated 2fsprogs to 1.40.2 - updated ethtool to 6 - updated freetype to 2.3.5 - updated gd to 2.0.35 - updated glib to 2.12.13 - updated grsecurity to 2.1.11-2.4.35-200708101800 - updated gradm to 2.1.11-200708011700 - updated l7-protocols to 2007-07-27 - updated lftp to 3.5.12 - updated libpcap to 0.9.7 - updated linux to 2.4.35 - updated lm_sensors to 2.10.4 - updated memtest86 to 3.3 - updated motion to 3.2.8 - updated netfilter-layer7 to v2.13 - updated ntp to 4.2.4p3 - removed openswan - updated patch-o-matic-ng to 20070806 - updated pcre to 7.2 - updated postfix to 2.4.5 - updated quota to 3.15 - updated shorewall to 3.4.5 - updated strace to 4.5.16 - added strongswan 2.8.6 - updated sudo to 1.6.9p3 - updated sysstat to 7.1.6 - updated tar to 1.18 - updated tcpdump to 3.9.7 - updated vobcopy to 1.0.2 --- super-freeswan DELETED --- Index: patch-o-matic =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v retrieving revision 1.22.2.11 retrieving revision 1.22.2.12 diff -u -d -r1.22.2.11 -r1.22.2.12 --- patch-o-matic 6 Aug 2007 06:46:28 -0000 1.22.2.11 +++ patch-o-matic 19 Aug 2007 14:02:50 -0000 1.22.2.12 @@ -45,7 +45,6 @@ popd > /dev/null pushd $IPTABLES_DIR > /dev/null -# patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1 patch -p1 < ../netfilter-layer7-*/iptables-for-kernel-pre2.6.20-layer7-*.patch || exit 1 chmod +x extensions/.layer7-test || exit 1 popd > /dev/null Index: openldap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openldap,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -d -r1.20.2.2 -r1.20.2.3 --- openldap 10 Jan 2007 02:11:36 -0000 1.20.2.2 +++ openldap 19 Aug 2007 14:02:50 -0000 1.20.2.3 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: openldap -# Required-Start: $basebuildtools glibc libmcrypt libgcrypt gdbm db-4 openssl +# Required-Start: $basebuildtools glibc libmcrypt libgcrypt gdbm db-4 openssl krb5 # Required-Stop: # Default-Start: 1 2 # Default-Stop: @@ -26,9 +26,20 @@ case $1 in build ) if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then + OPTIONS="" + # we can't use sasl at the moment, otherwise we get a dependency loop + #if [ "$CONFIG_CYRUS_SASL" = "y" ]; then + # OPTIONS="$OPTIONS --with-cyrus-sasl --enable-spasswd" + #fi + if [ "$CONFIG_KERBEROS5" = "y" ]; then + OPTIONS="$OPTIONS --with-kerberos --enable-kpasswd" + fi ./configure --prefix=/usr --libexecdir=/usr/sbin --localstatedir=/var --sysconfdir=/etc \ --mandir=/usr/share/man --enable-syslog --enable-dynamic --enable-ipv6 \ - --enable-slurpd --enable-slapd --enable-rewrite || exit 1 + --enable-slurpd --enable-slapd --enable-rewrite --with-tls --enable-rewrite \ + --enable-bdb --enable-dnssrv --enable-hdb --enable-ldap --enable-ldbm --enable-passwd \ + --enable-perl --enable-meta --enable-monitor --enable-null \ + --enable-overlays=mod --enable-modules $OPTIONS || exit 1 make $PMAKE depend || exit 1 make $PMAKE all || exit 1 strip_debug @@ -67,6 +78,10 @@ echo "START_SLURPD=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_SLURPD=\"Standalone LDAP Update Replication Daemon (OpenLDAP)\"" >> $SOFTWAREHELP + echo "# start the daemon with TLS support?" >> $CONFIGFILE + echo "# you will have to create certificates first and configure slapd accordingly?" >> $CONFIGFILE + echo "SLAPD_USE_TLS=no" >> $CONFIGFILE + echo >> $CONFIGFILE cp $MYDIR/scripts/slurpd $ETCDIR/etc/init.d || exit 1 fi --- NEW FILE: strongswan --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/Attic/strongswan,v $ # $Revision: 1.1.2.1 $ # $Date: 2007/08/19 14:02:50 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: strongswan # Required-Start: $basebuildtools $libs curl openldap # Required-Stop: # Default-Start: 1 2 # Default-Stop: # Description: description ### END INIT INFO # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings MYNAME=FREESWAN OPTIONS="USE_LIBCURL=true" if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then OPTIONS="$OPTIONS USE_LDAP=true USE_KERNEL26=false" fi case $1 in build ) if [ "$CONFIG_STRONGSWAN" = "y" ]; then # update kernel config if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then set_kernel_option CONFIG_IPSEC y set_kernel_option CONFIG_IPSEC_IPIP y set_kernel_option CONFIG_IPSEC_AH y set_kernel_option CONFIG_IPSEC_AUTH_HMAC_MD5 y set_kernel_option CONFIG_IPSEC_AUTH_HMAC_SHA1 y set_kernel_option CONFIG_IPSEC_ESP y set_kernel_option CONFIG_IPSEC_ENC_3DES y set_kernel_option CONFIG_IPSEC_ALG_AES m set_kernel_option CONFIG_IPSEC_ALG_BLOWFISH m set_kernel_option CONFIG_IPSEC_ALG_TWOFISH m set_kernel_option CONFIG_IPSEC_ALG_SERPENT m set_kernel_option CONFIG_IPSEC_ALG_SHA2 m set_kernel_option CONFIG_IPSEC_IPCOMP y set_kernel_option CONFIG_IPSEC_DEBUG n set_kernel_option CONFIG_KLIBS m set_kernel_option CONFIG_IPSEC_ALG y set_kernel_option CONFIG_IPSEC_ENC_AES set_kernel_option CONFIG_IPSEC_ALG_NON_LIBRE n set_kernel_option CONFIG_IPSEC_ALG_CRYPTOAPI m set_kernel_option CONFIG_KLIBS m set_kernel_option CONFIG_KLIPS_IPIP y set_kernel_option CONFIG_KLIPS_AH y set_kernel_option CONFIG_KLIPS_ESP y set_kernel_option CONFIG_KLIPS_ENC_3DES y set_kernel_option CONFIG_KLIPS_ENC_AES y set_kernel_option CONFIG_KLIPS_AUTH_HMAC_MD5 y set_kernel_option CONFIG_KLIPS_AUTH_HMAC_SHA1 y set_kernel_option CONFIG_KLIPS_IPCOMP y set_kernel_option CONFIG_KLIPS_DEBUG n set_kernel_option CONFIG_IPSEC_NAT_TRAVERSAL y fi replace_str Makefile.inc /usr/local /usr replace_str Makefile.inc /usr/src/linux $KERNELDIR KERNELSRC=$KERNELDIR # not sure why we need that here, but let's just accept it... set_kernel_option CONFIG_WDT_W83627 m # make sure we didn't miss any options and install the kernel patches make oldmod $OPTIONS || exit 1 # compile freeswan # parallel build fails - do not use $PMAKE make module $OPTIONS || exit 1 make programs $OPTIONS || exit 1 strip_debug fi ;; install ) if [ "$CONFIG_STRONGSWAN" = "y" ]; then rm -rf $TMPDIR rm -rf /lib/modules/$KERNELVERSION/* mkdir -p $TMPDIR/etc/rc.d/init.d/ || exit 1 make install minstall $OPTIONS DESTDIR=$TMPDIR || exit 1 mkdir -p $CDDIR/lib/modules/$KERNELVERSION/net/ || exit 1 cp -vdpR /lib/modules/$KERNELVERSION $CDDIR/lib/modules/ || exit 1 copy_docs $TMPDIR cp -vdpR $TMPDIR/usr $CDDIR || exit 1 rm -rf $TMPDIR/etc/rc.d || exit 1 cp -vdpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 cp -vp $MYDIR/scripts/ipsec $ETCDIR/etc/init.d || exit 1 rm -rf $TMPDIR || exit 1 chmod 700 $ETCDIR/etc/ipsec.d || exit 1 # fix a problem with the read-only modules.dep replace_str $CDDIR/usr/lib/ipsec/_startklips "depmod -a >" "depmod -an >" rm $CDDIR/usr/lib/ipsec/_startklips.old echo "# Start $MYNAME?" >> $CONFIGFILE echo "START_IPSEC=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_IPSEC=\"IPSEC is the $MYNAME VPN using the IPSEC protocol\"" >> $SOFTWAREHELP fi ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.54.2.1 retrieving revision 1.54.2.2 diff -u -d -r1.54.2.1 -r1.54.2.2 --- linux 4 Sep 2004 15:00:16 -0000 1.54.2.1 +++ linux 19 Aug 2007 14:02:50 -0000 1.54.2.2 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: linux -# Required-Start: $basebuildtools $libs pptp-patches grsecurity xfsprogs LVM2 LVM patch-o-matic super-freeswan bridge-utils lm_sensors iproute2 watchdog MOSKRN pcwd usbat-02 fblogo mxser +# Required-Start: $basebuildtools $libs pptp-patches grsecurity xfsprogs LVM2 LVM patch-o-matic strongswan bridge-utils lm_sensors iproute2 watchdog MOSKRN pcwd usbat-02 fblogo mxser # Required-Stop: # Default-Start: 1 2 # Default-Stop: Index: curl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/curl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- curl 15 Apr 2006 01:23:09 -0000 1.1.2.1 +++ curl 19 Aug 2007 14:02:50 -0000 1.1.2.2 @@ -32,11 +32,11 @@ --with-ssl=/usr --with-ca-bundle=/etc/curl/ca.crt \ --enable-crypto-auth --with-zlib=/usr \ --enable-cookies --enable-file --enable-ftp --enable-http --enable-ipv6 --enable-ldap \ - --disable-dict --disable-gopher --disable-telnet || exit 1 + --disable-dict --disable-gopher --disable-telnet --enable-nonblocking --enable-thread || exit 1 make $PMAKE || exit 1 strip_debug - # + # install it, other programs need the libraries make install || exit 1 fi ;; |
