Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28428/scripts
Modified Files:
Tag: rel-1-2-patches
cyrus-sasl grsecurity postfix
Log Message:
- updated Linux-PAM to 0.99.6.1
- updated Mail-SpamAssassin to 3.1.4
- updated clamav to 0.88.4
- updated cyrus-imapd to 2.3.7
- updated cyrus-sasl to 2.1.22
- updated dnsmasq to 2.33
- updated dovecot to 1.0.rc6
- updated gradm-2.1.9 to 200607142202
- updated grsecurity-2.1.9-2.4.33 to 200608131429
- updated httpd to 2.2.3
- updated joe to 3.5
- updated l7-protocols to 2006-06-03
- updated lftp to 3.5.4
- updated linux to 2.4.33
- updated mdadm to 2.5.3
- updated mrtg to 2.14.5
- updated nfs-utils to 1.0.9
- updated nut to 2.0.4
- updated openldap to 2.3.25
- updated openswan to 2.4.6
- updated php to 4.4.3
- updated postfix to 2.3.1
- updated vmware tools and modules
- pam file for vsftpd doesn't check for the shell anymore
Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -d -r1.24.2.5 -r1.24.2.6
--- postfix 9 Jun 2005 23:02:23 -0000 1.24.2.5
+++ postfix 17 Aug 2006 22:58:03 -0000 1.24.2.6
@@ -36,7 +36,7 @@
AUXLIBS="$AUXLIBS -lssl -lcrypto"
fi
if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
- CCARGS="$CCARGS -DUSE_SASL_AUTH -I/usr/include/sasl"
+ CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
AUXLIBS="$AUXLIBS -lsasl2"
fi
if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
@@ -51,6 +51,11 @@
CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/pgsql"
AUXLIBS="$AUXLIBS -lpq"
fi
+ if [ "$CONFIG_DOVECOT" = "y" ]; then
+ if [ -z "$(echo $CCARGS | grep USE_SASL_AUTH)" ]; then
+ CCARGS="$CCARGS -DUSE_SASL_AUTH"
+ fi
+ fi
make makefiles CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" || exit 1
make $PMAKE || exit 1
strip_debug
Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -u -d -r1.20.2.8 -r1.20.2.9
--- grsecurity 5 Jun 2006 00:19:02 -0000 1.20.2.8
+++ grsecurity 17 Aug 2006 22:58:03 -0000 1.20.2.9
@@ -35,7 +35,6 @@
patch -p0
}
-
case $1 in
build )
if [ "$CONFIG_GRSECURITY" = "y" ] ; then
@@ -45,16 +44,17 @@
> grsecurity.patch || exit 1
# apply a patch to the patch if there's one
PATCHFILE="$(ls $DL_DIR/src/grsecurity-2.*-${CONFIG_LINUX_VERSION}.*-patch2patch.bz2 2>/dev/null)"
- [ -n "${PATCHFILE}" ] && apply_patch2grsecurity_patch ${PATCHFILE} || exit 1
+ [ -n "${PATCHFILE}" ] && (apply_patch2grsecurity_patch ${PATCHFILE} || exit 1)
if [ ! "$CONFIG_VHZ" = "OFF" ]; then
PATCHFILE="$(ls $DL_DIR/src/grsecurity-kernel-vhz1.patch.bz2 2>/dev/null)"
- [ -n "${PATCHFILE}" ] && apply_patch2grsecurity_patch ${PATCHFILE} || exit 1
+ [ -n "${PATCHFILE}" ] && (apply_patch2grsecurity_patch ${PATCHFILE} || exit 1 )
fi
# patch kernel version inside patch so this patch applies cleanly
eval $(grep ^EXTRAVERSION Makefile | tr -d ' ')
eval $(grep ^\+EXTRAVERSION grsecurity.patch | tr -d ' ' | \
sed -e "s/+\(EXTRAVERSION\)/GRSEC_\1/")
- cat <<-EOF | patch -p0 || exit 1
+ if [ -n "${EXTRAVERSION}" ]; then
+ cat <<-EOF | patch -p0 -l || exit 1
--- grsecurity.patch
+++ grsecurity.patch
@@ -974,2 +974,2 @@
@@ -63,6 +63,7 @@
+-EXTRAVERSION = ${EXTRAVERSION}
++EXTRAVERSION = ${EXTRAVERSION}${GRSEC_EXTRAVERSION}
EOF
+ fi
# finally apply grsecurity patch to kernel tree
cat grsecurity.patch | patch -p1 || exit 1
if [ ! "$CONFIG_VHZ" = "OFF" ]; then
Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -d -r1.14.2.5 -r1.14.2.6
--- cyrus-sasl 24 Oct 2005 22:45:34 -0000 1.14.2.5
+++ cyrus-sasl 17 Aug 2006 22:58:03 -0000 1.14.2.6
@@ -35,7 +35,7 @@
touch cyrus-sasl-patches.done
fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-krb4 --enable-shared \
- --disable-static --with-saslauthd --with-pwcheck --with-configdir=/etc/sasl2 || exit 1
+ --enable-login --disable-static --with-saslauthd --with-pwcheck --with-configdir=/etc/sasl2 || exit 1
# parallel builds cause problems
make all || exit 1
strip_debug
|
