Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6044
Modified Files:
e2fsprogs ipsec-tools ntp openssh pwlib pptp-patches settings
tcp_wrappers linux-wlan-ng
Log Message:
-- elimination of compilation errors (kernel 2.6.20)
Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pwlib 27 Dec 2005 15:46:15 -0000 1.18
+++ pwlib 22 Feb 2007 13:43:16 -0000 1.19
@@ -32,6 +32,12 @@
if [ "$CONFIG_PWLIB" = "y" ]; then
rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
export PWLIBDIR=$PWD
+ if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+ CFLAGS="-Os -fno-stack-protector"
+ else
+ CFLAGS="-Os"
+ fi
+ export CFLAGS
# remove the --disable-openldap once a pwlib update comes out
./configure --prefix=/usr --disable-openldap || exit 1
# parallel builds fails ($PMAKE)
Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- settings 8 Apr 2006 01:16:54 -0000 1.49
+++ settings 22 Feb 2007 13:43:16 -0000 1.50
@@ -50,6 +50,9 @@
KERNELDIR=$(find_src_dir linux-$CONFIG_LINUX_VERSION)
KERNELVERSION=$(grep UTS_RELEASE $KERNELDIR/include/linux/version.h 2> /dev/null | sed 's/\"//g' | cut -d " " -f 3)
+if [ "$KERNELVERSION" == "" ] ; then
+KERNELVERSION=$(grep UTS_RELEASE $KERNELDIR/include/linux/utsrelease.h 2> /dev/null | sed 's/\"//g' | cut -d " " -f 3)
+fi
SRCDIR=$DL_DIR/src
SRCEXTRADIR=$DL_DIR/src-extra
Index: openssh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openssh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- openssh 18 Dec 2006 17:05:35 -0000 1.33
+++ openssh 22 Feb 2007 13:43:16 -0000 1.34
@@ -28,8 +28,11 @@
case $1 in
build )
if [ "$CONFIG_OPENSSH" = "y" ]; then
+ if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then
+ WITHTCPWRAPPER='--with-tcp-wrappers'
+ fi
./configure --prefix=/usr --sysconfdir=/etc/ssh --localstatedir=/var \
- --with-tcp-wrappers --with-md5-passwords --with-pam || exit 1
+ $WITHTCPWRAPPER --with-md5-passwords --with-pam || exit 1
# disable those annoying excess permissions warnings....
echo " #undef USE_BTMP" >> config.h
make $PMAKE all || exit 1
Index: tcp_wrappers
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/tcp_wrappers,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tcp_wrappers 10 Jan 2007 02:12:00 -0000 1.6
+++ tcp_wrappers 22 Feb 2007 13:43:16 -0000 1.7
@@ -30,6 +30,7 @@
if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then
if [ ! -f .patch.done ]; then
zcat $DL_DIR/src/tcp_wrappers_7.6.diff.gz | patch || exit 1
+ bzcat $DL_DIR/src/tcp_wrappers-7.6-gcc34-1.patch.bz2 | patch -p1 || exit 1
touch .patch.done
fi
make linux || exit 1
Index: e2fsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e2fsprogs,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- e2fsprogs 14 Apr 2006 15:48:40 -0000 1.21
+++ e2fsprogs 22 Feb 2007 13:43:16 -0000 1.22
@@ -25,7 +25,7 @@
case $1 in
build )
- ./configure --prefix= --disable-nls --disable-debugfs --enable-elf-shlibs || exit 1
+ ./configure --prefix= --disable-nls --enable-elf-shlibs || exit 1
make $PMAKE all || exit 1
strip_debug
# make sure the system has the actual files
Index: linux-wlan-ng
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux-wlan-ng,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- linux-wlan-ng 13 Jan 2005 00:11:34 -0000 1.17
+++ linux-wlan-ng 22 Feb 2007 13:43:16 -0000 1.18
@@ -41,7 +41,9 @@
echo "TARGET_ROOT_ON_HOST=$TMPDIR" >> default.config
echo $TMPDIR > DL.TMPDIR
-
+
+ bzcat bzcat $DL_DIR/src/linux-wlan-ng-0.2.7.patch.bz2 | patch -p0 || exit 1
+
make default_config || exit 1
if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
Index: pptp-patches
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pptp-patches,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pptp-patches 4 Oct 2005 02:49:43 -0000 1.17
+++ pptp-patches 22 Feb 2007 13:43:16 -0000 1.18
@@ -29,7 +29,7 @@
if [ "$CONFIG_POPTOP" = "y" ] || [ "$CONFIG_PPTP_CLIENT" = "y" ]; then
pushd $KERNELDIR || exit 1
- zcat $SRCDIR/linux-2.6.*-mppe-mppc-*.patch.gz | patch -p1 || exit 1
+ bzcat $SRCDIR/linux-2.6.*-mppe-mppc-*.patch.bz2 | patch -p1 || exit 1
echo "CONFIG_PPP_MPPE_MPPC=m" >> $KERNELDIR/.config || exit 1
fi
Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ipsec-tools 4 May 2006 01:15:15 -0000 1.6
+++ ipsec-tools 22 Feb 2007 13:43:16 -0000 1.7
@@ -32,7 +32,7 @@
case $1 in
build )
./bootstrap
- ./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=$KERNELDIR/include \
+ ./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=/usr/include \
--enable-frag --enable-stats --enable-dpd --enable-natt || exit 1
make || exit 1
make install || exit 1
Index: ntp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ntp 4 Oct 2005 02:49:43 -0000 1.21
+++ ntp 22 Feb 2007 13:43:16 -0000 1.22
@@ -29,7 +29,7 @@
build )
if [ "$CONFIG_NTP" = "y" ]; then
if [ ! -f dl-patch.done ]; then
- bzcat $DL_DIR/src/ntpconfig-phone.patch.bz2 | patch -p0 || exit 1
+# bzcat $DL_DIR/src/ntpconfig-phone.patch.bz2 | patch -p0 || exit 1
touch dl-patch.done
fi
./configure --prefix=/usr --enable-all-clocks --enable-parse-clocks || exit 1
|
