Menu
▾
▴
[Devil-linux-commit] build/scripts bc, NONE, 1.1 check, NONE, 1.1 e2guardian, NONE, 1.1 gettext, NONE, 1.1 gss, NONE, 1.1 libecap, NONE, 1.1 libidn, NONE, 1.1 open-isns, NONE, 1.1 talloc, NONE, 1.1 DenyHosts, 1.8, 1.9 GeoIP, 1.4, 1.5 Linux-PAM, 1.11, 1.12 Pound, 1.5, 1.6 acl, 1.20, 1.21 arping, 1.4, 1.5 attr, 1.15, 1.16 bacula, 1.13, 1.14 bison, 1.10, 1.11 bridge-utils, 1.19, 1.20 build.sh, 1.118, 1.119 cdrtools, 1.15, 1.16 clamav, 1.27, 1.28 compartment, 1.20, 1.21 cpio, 1.10, 1.11 cracklib, 1.6, 1.7 create_cd_dirs, 1.42, 1.43 cyrus-imapd, 1.36, 1.37 dhcp, 1.30, 1.31 dovecot, 1.32, 1.33 dvd+rw-tools, 1.6, 1.7 ebtables, 1.18, 1.19 flow-tools, 1.4, 1.5 functions, 1.80, 1.81 gawk, 1.14, 1.15 gcc-4, 1.11, 1.12 gd, 1.7, 1.8 glib, 1.12, 1.13 glibc, 1.62, 1.63 gnupg, 1.20, 1.21 gpm, 1.11, 1.12 groff, 1.17, 1.18 grub, 1.27, 1.28 heartbeat, 1.26, 1.27 id3lib, 1.6, 1.7 inetutils, 1.10, 1.11 insserv, 1.18, 1.19 ipcalc, 1.6, 1.7 iptables, 1.41, 1.42 iptraf, 1.22, 1.23 irqbalance, 1.2, 1.3 jailkit, 1.7, 1.8 keepalived, 1.5, 1.6 kmod, 1.2, 1.3 krb5, 1.13, 1.14 libcap, 1.6, 1.7 libpng, 1.7, 1.8 libtirpc, 1.4, 1.5 libusb, 1.9, 1.10 libxml2, 1.7, 1.8 libxslt, 1.6, 1.7 logrotate, 1.21, 1.22 loop-AES, 1.14, 1.15 make, 1.7, 1.8 mdadm, 1.18, 1.19 minicom, 1.13, 1.14 mod_authn_otp, 1.2, 1.3 modsecurity-apache, 1.5, 1.6 mtools, 1.16, 1.17 mtr, 1.5, 1.6 mysql, 1.34, 1.35 nagios-plugins, 1.7, 1.8 nasm, 1.15, 1.16 nbd, 1.8, 1.9 ncurses, 1.16, 1.17 net-snmp, 1.18, 1.19 netatalk, 1.5, 1.6 netpbm, 1.6, 1.7 nginx, 1.1, 1.2 noip_updater, 1.17, 1.18 ntop, 1.16, 1.17 ntp, 1.29, 1.30 open-iscsi, 1.4, 1.5 open-vm-tools, 1.22, 1.23 openssl, 1.34, 1.35 pam-pgsql, 1.6, 1.7 pam_radius, 1.10, 1.11 pciutils, 1.16, 1.17 perl, 1.64, 1.65 php, 1.38, 1.39 portmap, 1.7, 1.8 ppp, 1.26, 1.27 prepare, 1.95, 1.96 procinfo, 1.13, 1.14 procmail, 1.5, 1.6 procps, 1.16, 1.17 ptlib, 1.2, 1.3 quagga, 1.18, 1.19 readline, 1.10, 1.11 rng-tools, 1.5, 1.6 rpcbind, 1.5, 1.6 sagator, 1.28, 1.29 samba, 1.41, 1.42 sarg, 1.9, 1.10 settings, 1.68, 1.69 siproxd, 1.5, 1.6 squashfs, 1.6, 1.7 squid, 1.35, 1.36 strace, 1.18, 1.19 strongswan, 1.15, 1.16 stunnel, 1.18, 1.19 syslinux, 1.30, 1.31 syslog-ng, 1.24, 1.25 telnet-bsd, 1.11, 1.12 thttpd, 1.22, 1.23 udev, 1.24, 1.25 unzip, 1.13, 1.14 usbutils, 1.16, 1.17 util-linux, 1.53, 1.54 vsftpd, 1.19, 1.20 watchdog, 1.24, 1.25 webmin, 1.15, 1.16 whois, 1.11, 1.12 xerces-c, 1.1, 1.2 xml-security-c, 1.1, 1.2 xz, 1.5, 1.6 yp-tools, 1.7, 1.8 aide, 1.9, NONE alsa-driver, 1.17, NONE alsa-firmware, 1.2, NONE alsa-lib, 1.13, NONE alsa-utils, 1.13, NONE alsaplayer, 1.8, NONE arpwatch, 1.25, NONE aufs, 1.11, NONE camsource, 1.9, NONE cgilib, 1.4, NONE cipe, 1.22, NONE daemontools, 1.12, NONE dansguardian, 1.9, NONE ddup, 1.13, NONE dev86, 1.7, NONE distcc, 1.19, NONE djbdns, 1.16, NONE docbook2X, 1.8, NONE dovecot_deleted_to_trash, 1.8, NONE dst, 1.5, NONE e100, 1.18, NONE e1000, 1.20, NONE eagle-usb, 1.15, NONE fprobe, 1.6, NONE fprobe-ulog, 1.5, NONE frox, 1.9, NONE gdchart, 1.3, NONE hotplug, 1.14, NONE igb, 1.4, NONE imap, 1.7, NONE ippool, 1.7, NONE ipsec-tools, 1.22, NONE iputils, 1.16, NONE isapnptools, 1.6, NONE jfsutils, 1.12, NONE jftpgw, 1.20, NONE lcd4linux, 1.9, NONE libiconv, 1.4, NONE makedepend, 1.8, NONE module-init-tools, 1.12, NONE mpeg_encode, 1.5, NONE ndiswrapper, 1.6, NONE net-tools, 1.22, NONE netacct-mysql, 1.13, NONE nss_ldap, 1.4, NONE oidentd, 1.19, NONE openl2tp, 1.12, NONE opt, 1.11, NONE p7zip, 1.10, NONE pam_mysql, 1.6, NONE patch-o-matic, 1.45, NONE pcwd, 1.11, NONE pohmelfs, 1.4, NONE portslave, 1.21, NONE pptp-patches, 1.25, NONE rcs, 1.13, NONE rpm, 1.16, NONE ser, 1.10, NONE ssmtp, 1.4, NONE ucarp, 1.7, NONE ucspi-tcp, 1.15, NONE unarj, 1.8, NONE unionfs, 1.8, NONE unrar, 1.12, NONE usbat-02, 1.4, NONE vlan, 1.14, NONE vobcopy, 1.5, NONE wvdial, 1.16, NONE wvstreams, 1.20, NONE xmbmon, 1.6, NONE
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14581/scripts Modified Files: DenyHosts GeoIP Linux-PAM Pound acl arping attr bacula bison bridge-utils build.sh cdrtools clamav compartment cpio cracklib create_cd_dirs cyrus-imapd dhcp dovecot dvd+rw-tools ebtables flow-tools functions gawk gcc-4 gd glib glibc gnupg gpm groff grub heartbeat id3lib inetutils insserv ipcalc iptables iptraf irqbalance jailkit keepalived kmod krb5 libcap libpng libtirpc libusb libxml2 libxslt logrotate loop-AES make mdadm minicom mod_authn_otp modsecurity-apache mtools mtr mysql nagios-plugins nasm nbd ncurses net-snmp netatalk netpbm nginx noip_updater ntop ntp open-iscsi open-vm-tools openssl pam-pgsql pam_radius pciutils perl php portmap ppp prepare procinfo procmail procps ptlib quagga readline rng-tools rpcbind sagator samba sarg settings siproxd squashfs squid strace strongswan stunnel syslinux syslog-ng telnet-bsd thttpd udev unzip usbutils util-linux vsftpd watchdog webmin whois xerces-c xml-security-c xz yp-tools Added Files: bc check e2guardian gettext gss libecap libidn open-isns talloc Removed Files: aide alsa-driver alsa-firmware alsa-lib alsa-utils alsaplayer arpwatch aufs camsource cgilib cipe daemontools dansguardian ddup dev86 distcc djbdns docbook2X dovecot_deleted_to_trash dst e100 e1000 eagle-usb fprobe fprobe-ulog frox gdchart hotplug igb imap ippool ipsec-tools iputils isapnptools jfsutils jftpgw lcd4linux libiconv makedepend module-init-tools mpeg_encode ndiswrapper net-tools netacct-mysql nss_ldap oidentd openl2tp opt p7zip pam_mysql patch-o-matic pcwd pohmelfs portslave pptp-patches rcs rpm ser ssmtp ucarp ucspi-tcp unarj unionfs unrar usbat-02 vlan vobcopy wvdial wvstreams xmbmon Log Message: Major overhaul of software. First 1.8 draft. --- unarj DELETED --- --- iputils DELETED --- --- camsource DELETED --- --- nss_ldap DELETED --- --- libiconv DELETED --- Index: stunnel =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/stunnel,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- stunnel 5 Dec 2011 09:11:38 -0000 1.18 +++ stunnel 6 Oct 2015 00:59:17 -0000 1.19 @@ -22,7 +22,7 @@ [ "$CONFIG_TCP_WRAPPERS" = "n" ] && OPT_FLAGS="$OPT_FLAGS --disable-libwrap" if [ "$CONFIG_STUNNEL" = "y" ]; then #if [ ! -f .dl-patches.done ]; then - #bzcat $DL_DIR/src/stunnel-4.09-1_minute_sleep_fix.patch.bz2 | patch -p1 || exit 1 + #xzcat $DL_DIR/src/stunnel-4.09-1_minute_sleep_fix.patch.xz | patch -p1 || exit 1 #touch .dl-patches.done #fi #KDIR=$(find_src_dir linux) Index: flow-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/flow-tools,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- flow-tools 5 Dec 2011 09:11:37 -0000 1.4 +++ flow-tools 6 Oct 2015 00:59:15 -0000 1.5 @@ -24,20 +24,12 @@ OPTIONS="$OPTIONS --with-mysql" fi if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then - OPTIONS="$OPTIONS --with-pgsql" + OPTIONS="$OPTIONS --with-postgresql" fi - ./configure --prefix=/usr --sysconfdir=/etc/flow-tools --disable-nls --enable-lfs $OPTIONS || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc/flow-tools ${OPTIONS} || exit 1 make $PMAKE || exit 1 - if [ "$CONFIG_PERL" = "y" ]; then - pushd contrib/ > /dev/null || exit 1 - tar vfxz Cflow-*.tar.gz && cd Cflow-* || exit 1 - perl Makefile.PL || exit 1 - popd > /dev/null - fi - - fi ;; @@ -46,11 +38,6 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 - if [ "$CONFIG_PERL" = "y" ]; then - pushd contrib/Cflow-* > /dev/null || exit 1 - make install DESTDIR=$TMPDIR || exit 1 - popd > /dev/null - fi rm -f $TMPDIR/usr/lib/*a || exit 1 rm -rf $TMPDIR/usr/include || exit 1 cp -dpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 Index: vsftpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vsftpd,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- vsftpd 5 Dec 2011 09:11:38 -0000 1.19 +++ vsftpd 6 Oct 2015 00:59:18 -0000 1.20 @@ -38,8 +38,7 @@ fi echo -e "\n#endif /* VSF_BUILDDEFS_H */" >> $BUILDDEF || exit 1 - #make $PMAKE CFLAGS="-O2 -Wall -Wshadow -W -no-pie" LINK="-Wl,-s,-pie" || exit 1 - make $PMAKE || exit 1 + make CFLAGS="-U_FORTIFY_SOURCE -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wall -W -Wshadow -Werror -Wformat-security -D_FORTIFY_SOURCE=2 -idirafter" $PMAKE || exit 1 fi ;; Index: gd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gd 5 Dec 2011 09:11:38 -0000 1.7 +++ gd 6 Oct 2015 00:59:16 -0000 1.8 @@ -16,6 +16,8 @@ case $1 in build ) + cd $(find_src_dir libgd-gd-2.1.1) || exit 1 + ./bootstrap.sh || exit 1 ./configure --prefix=/usr --without-libiconv-prefix || exit 1 make $PMAKE all || exit 1 Index: clamav =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/clamav,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- clamav 7 Feb 2015 00:34:55 -0000 1.27 +++ clamav 6 Oct 2015 00:59:15 -0000 1.28 @@ -16,13 +16,6 @@ case $1 in build ) if [ "$CONFIG_CLAMAV" = "y" ]; then - if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then - bzcat $SRCDIR/clamav-*-libunrar3.patch.bz2 | patch -p1 || exit 1 - bzcat $SRCDIR/clamav-*-un7zip.patch.bz2 | patch -p1 || exit 1 - aclocal - autoconf - automake - fi CONFIG_EXTRA="" if [ "$CONFIG_SENDMAIL_LIBMILTER" = "y" ]; then Index: mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mysql,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- mysql 17 Mar 2012 15:05:15 -0000 1.34 +++ mysql 6 Oct 2015 00:59:16 -0000 1.35 @@ -32,8 +32,8 @@ make $PMAKE all || exit 1 # install it, so other program can make use of it - make install - cp /usr/share/mysql/my-small.cnf /etc/my.cnf || exit 1 + make install + cp /usr/share/mysql/my-default.cnf /etc/my.cnf || exit 1 fi ;; @@ -51,8 +51,7 @@ rm $TMPDIR/usr/lib/*.a || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/mysql-test || exit 1 - # cp $TMPDIR/usr/share/mysql/my-small.cnf $ETCDIR/etc/my.cnf || exit 1 - sed 's/^\[mysqld\] *$/&\nuser\t\t= mysql/' $TMPDIR/usr/share/mysql/my-small.cnf > $ETCDIR/etc/my.cnf || exit 1 + sed 's/^\[mysqld\] *$/&\nuser\t\t= mysql/' $TMPDIR/usr/share/mysql/my-default.cnf > $ETCDIR/etc/my.cnf || exit 1 mkdir -p $CDDIR copy_files $TMPDIR/usr $CDDIR || exit 1 rm -rf $TMPDIR || exit 1 Index: xml-security-c =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xml-security-c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xml-security-c 24 Jun 2015 01:27:46 -0000 1.1 +++ xml-security-c 6 Oct 2015 00:59:18 -0000 1.2 @@ -16,7 +16,7 @@ case $1 in build ) - LDFLAGS=-liconv ./configure --prefix=/usr || exit 1 + ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: telnet-bsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/telnet-bsd,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- telnet-bsd 5 Dec 2011 09:11:38 -0000 1.11 +++ telnet-bsd 6 Oct 2015 00:59:17 -0000 1.12 @@ -20,9 +20,9 @@ build ) if [ "$CONFIG_TELNET_BSD" = "y" ]; then if [ ! -f telnet-patches.done ]; then - bzcat $DL_DIR/src/telnet-bsd-1.0.diff.bz2 | patch -p0 || exit 1 - bzcat $DL_DIR/src/telnet-bsd-1.0-temp-buffer-increase.diff.bz2 | patch -p1 || exit 1 - bzcat $DL_DIR/src/telnet-bsd-1.0-strncpy.diff.bz2 | patch -p0 || exit 1 + xzcat $DL_DIR/src/telnet-bsd-1.0.diff.xz | patch -p0 || exit 1 + xzcat $DL_DIR/src/telnet-bsd-1.0-temp-buffer-increase.diff.xz | patch -p1 || exit 1 + xzcat $DL_DIR/src/telnet-bsd-1.0-strncpy.diff.xz | patch -p0 || exit 1 touch telnet-patches.done fi ./configure --prefix=/usr --sysconfdir=/etc || exit 1 Index: samba =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/samba,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- samba 16 Aug 2015 14:06:23 -0000 1.41 +++ samba 6 Oct 2015 00:59:17 -0000 1.42 @@ -26,8 +26,8 @@ --with-aio-support --with-dnsupdate \ --enable-fhs --with-syslog --with-utmp \ --with-acl-support --with-winbind --with-quotas \ - --with-logfilebase=/var/log \ - --enable-nss-wrapper --enable-socket-wrapper --with-pam --with-pam_smbpass || exit 1 + --with-logfilebase=/var/log || exit 1 + #--enable-nss-wrapper --enable-socket-wrapper --with-pam --with-pam_smbpass || exit 1 make $PMAKE || exit 1 # some tools need samba installed --- dansguardian DELETED --- --- gdchart DELETED --- --- pohmelfs DELETED --- --- cipe DELETED --- --- openl2tp DELETED --- --- dovecot_deleted_to_trash DELETED --- Index: thttpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/thttpd,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- thttpd 5 Dec 2011 09:11:38 -0000 1.22 +++ thttpd 6 Oct 2015 00:59:17 -0000 1.23 @@ -19,29 +19,6 @@ case $1 in build ) if [ "$CONFIG_THTTPD" = "y" ]; then - if [ ! -f dl-patch1.done ]; then - zcat $DL_DIR/src/thttpd_2.25b-11.diff.gz | patch -p1 || exit 1 - touch dl-patch1.done - fi - if [ ! -f dl-patch2.done ]; then - for PATCH in $(ls debian/patches/*.dpatch) - do - for P in 0 1 2 3 x; - do - if patch --dry-run -i $PATCH -p${P} &> /dev/null ; then - echo "applying patch: $PATCH (p${P})" - patch -i $PATCH -p${P} || exit 1 - break - fi - if [ "${P}" = "x" ]; then - echo "!!!!!!!!!!!!!! Can't apply patch $PATCH !!!!!!!!!!!!!!!!" - #exit 1 - fi - done - done - touch dl-patch2.done - fi - [ $(grep -c ^proxy mime_types.txt) -eq 0 ] && echo "proxy application/x-ns-proxy-autoconfig" >> mime_types.txt ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 --- isapnptools DELETED --- Index: siproxd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/siproxd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- siproxd 5 Dec 2011 09:11:38 -0000 1.5 +++ siproxd 6 Oct 2015 00:59:17 -0000 1.6 @@ -20,7 +20,8 @@ case $1 in build ) if [ "$CONFIG_SIPROXD" = "y" ]; then - /bin/sh configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || exit 1 + patch_from_file 1 $DL_DIR/src/siproxd-tz.patch.xz || exit 1 + /bin/sh configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-included-libtool || exit 1 make $PMAKE all || exit 1 fi Index: libpng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libpng,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- libpng 5 Dec 2011 09:11:38 -0000 1.7 +++ libpng 6 Oct 2015 00:59:16 -0000 1.8 @@ -17,13 +17,15 @@ case $1 in build ) ZLIBDIR=$(find_src_dir zlib) - make -f scripts/makefile.linux prefix=/usr \ - ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR $PMAKE all || exit 1 + #make -f scripts/makefile.linux prefix=/usr \ + # ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR $PMAKE all || exit 1 + make -f scripts/makefile.linux prefix=/usr $PMAKE all || exit 1 # we have to install this immediately, because this is a library and could be needed by other sources - make -f scripts/makefile.linux prefix=/usr \ - ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR install || exit 1 + make -f scripts/makefile.linux prefix=/usr $PMAKE install || exit 1 + #make -f scripts/makefile.linux prefix=/usr \ + # ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR install || exit 1 ;; * ) Index: id3lib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/id3lib,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- id3lib 5 Dec 2011 09:11:38 -0000 1.6 +++ id3lib 6 Oct 2015 00:59:16 -0000 1.7 @@ -17,7 +17,7 @@ case $1 in build ) if [ "$CONFIG_ID3" = "y" ] || [ "$CONFIG_ID3V2" = "y" ]; then - patch_from_file 1 $DL_DIR/src/id3lib-3.8.3-gcc43-1.patch.bz2 || exit 1 + patch_from_file 1 $DL_DIR/src/id3lib-3.8.3-gcc43-1.patch.xz || exit 1 ./configure --prefix=/usr || exit 1 # don't use parallel builds make all || exit 1 --- opt DELETED --- Index: unzip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/unzip,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- unzip 5 Dec 2011 09:11:38 -0000 1.13 +++ unzip 6 Oct 2015 00:59:18 -0000 1.14 @@ -17,7 +17,7 @@ build ) if [ "$CONFIG_UNZIP" = "y" ]; then make -f unix/Makefile generic1 || exit 1 - + make -f unix/Makefile install prefix=/usr MANDIR=/usr/share/man/man1 fi ;; Index: pam-pgsql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pam-pgsql,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pam-pgsql 5 Dec 2011 09:11:38 -0000 1.6 +++ pam-pgsql 6 Oct 2015 00:59:16 -0000 1.7 @@ -17,23 +17,23 @@ case $1 in build ) if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then - replace_str pam_get_service.c '#include <security/pam_modules.h>' '#include <security/pam_modules.h>\n#include <stdio.h>' + ./autogen.sh || exit 1 - ./configure + ./configure || exit 1 make $PMAKE || exit 1 # install it in local system, because other programs could need it # make install DESTDIR=/lib/security/ || exit 1 - install -c -m 755 -o root pam_pgsql.so /lib/security/ || exit 1 + install -c -m 755 -o root .libs/pam_pgsql.so /lib/security/ || exit 1 fi ;; install ) if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then - install -c -m 755 -o root pam_pgsql.so $CDDIR/lib/security/ || exit 1 + install -c -m 755 -o root .libs/pam_pgsql.so $CDDIR/lib/security/ || exit 1 install -d -m 755 $CDDIR/usr/share/doc/libpam-pgsql || exit 1 install -c -m 644 README $CDDIR/usr/share/doc/libpam-pgsql || exit 1 fi --- NEW FILE: libidn --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/libidn,v $ # $Revision: 1.1 $ # $Date: 2015/10/06 00:59:16 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr --disable-nls || exit 1 make $PMAKE all || exit 1 # we have to install this immediately, because this is a library and could be needed by other sources make install || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: loop-AES =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/loop-AES,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- loop-AES 27 Feb 2011 22:21:30 -0000 1.14 +++ loop-AES 6 Oct 2015 00:59:16 -0000 1.15 @@ -17,7 +17,7 @@ case $1 in build ) - #patch_from_file 1 $DL_DIR/src/loop-AES-v3.5b-20110110.diff.bz2 + #patch_from_file 1 $DL_DIR/src/loop-AES-v3.5b-20110110.diff.xz #make CC="gcc -no-pie" LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 make PADLOCK=y EXTRA_CIPHERS=y LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 ;; Index: cpio =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cpio,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- cpio 5 Dec 2011 09:11:37 -0000 1.10 +++ cpio 6 Oct 2015 00:59:15 -0000 1.11 @@ -16,9 +16,8 @@ case $1 in build ) - #rm getopt.h - #ln -sf /usr/include/getopt.h getopt.h ./configure --prefix=/usr || exit 1 + patch_from_file 1 $DL_DIR/src/glibc-2.16-gnulib-nogets.patch.xz || exit 1 make $PMAKE all || exit 1 Index: nginx =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nginx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nginx 29 Mar 2014 15:03:17 -0000 1.1 +++ nginx 6 Oct 2015 00:59:16 -0000 1.2 @@ -21,7 +21,7 @@ if [ "$CONFIG_NGINX" = "y" ]; then PARAMS="" if [ "$CONFIG_MODSECURITY" = "y" ]; then - PARAMS="$PARAMS --add-module=$(find_src_dir modsecurity-apache)/nginx/modsecurity" + PARAMS="$PARAMS --add-module=$(find_src_dir modsecurity)/nginx/modsecurity" fi ./configure --prefix=/usr --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log \ --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --user=www --group=www \ --- fprobe DELETED --- Index: Pound =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Pound,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Pound 5 Dec 2011 09:11:37 -0000 1.5 +++ Pound 6 Oct 2015 00:59:14 -0000 1.6 @@ -19,7 +19,6 @@ case $1 in build ) if [ "$CONFIG_POUND" = "y" ]; then - patch_from_file 1 $DL_DIR/src/pound-2.5-openssl.patch.bz2 || exit 1 ./configure --prefix=/usr || exit 1 make || exit 1 --- alsa-firmware DELETED --- --- unionfs DELETED --- Index: util-linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- util-linux 18 Nov 2012 18:56:09 -0000 1.53 +++ util-linux 6 Oct 2015 00:59:18 -0000 1.54 @@ -16,15 +16,15 @@ case $1 in build ) - patch_from_file 1 $(find_src_dir loop-AES)/util-linux-2.21.2.diff || exit 1 + patch_from_file 1 $(find_src_dir loop-AES)/util-linux-2.26.2.diff || exit 1 ./configure --enable-arch --enable-partx --enable-write --disable-wall || exit 1 - if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then - make $PMAKE LDFLAGS="-pie" || exit 1 - else + #if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then + # make $PMAKE LDFLAGS="-pie" || exit 1 + #else make $PMAKE || exit 1 - fi + #fi # we need some of the tools later, so let's install it Index: jailkit =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jailkit,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- jailkit 5 Dec 2011 09:11:38 -0000 1.7 +++ jailkit 6 Oct 2015 00:59:16 -0000 1.8 @@ -18,8 +18,8 @@ build ) if [ "$CONFIG_PYTHON" = "y" ]; then #if [ ! -f devil-linux-patches.done ]; then - # bzcat $DL_DIR/src/jailkit-2.0-destdir.patch.bz2 | patch -p1 || exit 1 - # bzcat $DL_DIR/src/jailkit-2.0-jk_socketd-param.patch.bz2 | patch -p1 || exit 1 + # xzcat $DL_DIR/src/jailkit-2.0-destdir.patch.xz | patch -p1 || exit 1 + # xzcat $DL_DIR/src/jailkit-2.0-jk_socketd-param.patch.xz | patch -p1 || exit 1 # touch devil-linux-patches.done #fi ./configure --prefix=/usr --sysconfdir=/etc || exit 1 Index: libtirpc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libtirpc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- libtirpc 5 Dec 2011 09:11:38 -0000 1.4 +++ libtirpc 6 Oct 2015 00:59:16 -0000 1.5 @@ -16,14 +16,15 @@ case $1 in build ) - ./configure --prefix=/usr || exit 1 + ./bootstrap || exit 1 + ./configure --prefix=/usr --with-gssapi=/usr || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it make install ;; install ) - cp -p doc/etc_netconfig $ETCDIR/etc/netconfig + cp -p doc/netconfig $ETCDIR/etc/netconfig chmod 0644 $ETCDIR/etc/netconfig ;; * ) --- makedepend DELETED --- --- pptp-patches DELETED --- --- pcwd DELETED --- Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- settings 6 Dec 2011 08:18:43 -0000 1.68 +++ settings 6 Oct 2015 00:59:17 -0000 1.69 @@ -54,12 +54,12 @@ test -n "$CONFIG_PMAKE" && PMAKE="-j ${CONFIG_PMAKE}" test -n "$CONFIG_PARALLEL_JOBS" || CONFIG_PARALLEL_JOBS=1 -KERNELDIR=$(find_src_dir linux-3.*) -KERNELVERSION=$(make -s -C $KERNELDIR kernelrelease 2> /dev/null | grep ^3\. | grep -vi "directory" | grep -vi error) +KERNELMAJORVERSION=${CONFIG_LINUX_VERSION%.*} +KERNELDIR=$(find_src_dir linux-${KERNELMAJORVERSION}*) +KERNELVERSION=$(make -s -C $KERNELDIR kernelrelease 2> /dev/null | grep ^${KERNELMAJORVERSION}\. | grep -vi "directory" | grep -vi error) if [ -z "$KERNELVERSION" ]; then - KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null | grep ^3\. | grep -vi "directory" | grep -vi error) + KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null | grep ^${KERNELMAJORVERSION}\. | grep -vi "directory" | grep -vi error) fi -#KERNELVERSION=${KERNELVERSION%.*} SRCDIR=$DL_DIR/src SRCEXTRADIR=$DL_DIR/src-extra @@ -120,7 +120,6 @@ export CXXFLAGS="$CFLAGS" CONF_HOST="x86_64-unknown-linux-gnu" fi - cd ${WORKDIR} PKG=${0##*/} if [ "${PKG}" != ".configure" ]; then --- NEW FILE: talloc --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/talloc,v $ # $Revision: 1.1 $ # $Date: 2015/10/06 00:59:17 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE || exit 1 # we have to install this immediately, because this is a library and could be needed by other sources make install || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: squashfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squashfs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- squashfs 5 Dec 2011 09:11:38 -0000 1.6 +++ squashfs 6 Oct 2015 00:59:17 -0000 1.7 @@ -18,7 +18,7 @@ build ) if [ "$CONFIG_SQUASHFS" = "y" ]; then #if [ ! -f .dl.patch.done ]; then - # bzcat $SRCDIR/squashfs3.4-dl.patch.bz2 | patch -p0 || exit 1 + # xzcat $SRCDIR/squashfs3.4-dl.patch.xz | patch -p0 || exit 1 # touch .dl.patch.done #fi Index: webmin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/webmin,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- webmin 2 Jan 2012 14:19:27 -0000 1.15 +++ webmin 6 Oct 2015 00:59:18 -0000 1.16 @@ -25,7 +25,7 @@ build ) if [ "$CONFIG_WEBMIN" = "y" ]; then if [ ! -f devil_patch_done ]; then - bzcat $DL_DIR/src/webmin-init.patch.bz2 | patch -p1 || exit 1 + xzcat $DL_DIR/src/webmin-init.patch.xz | patch -p1 || exit 1 touch devil_patch_done fi echo Unpacking Additional Webmin Modules --- unrar DELETED --- Index: bison =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bison,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bison 5 Dec 2011 09:11:37 -0000 1.10 +++ bison 6 Oct 2015 00:59:15 -0000 1.11 @@ -21,9 +21,9 @@ case $1 in prepare ) if [ ! -f bison-patches.done ]; then - for p in $(ls $DL_DIR/src/bison-*patch*bz2 2> /dev/null) + for p in $(ls $DL_DIR/src/bison-*patch.xz 2> /dev/null) do - bzcat $p | patch -p0 || exit 1 + xzcat $p | patch -p0 || exit 1 done touch bison-patches.done fi --- net-tools DELETED --- Index: modsecurity-apache =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/modsecurity-apache,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- modsecurity-apache 29 Mar 2014 15:03:17 -0000 1.5 +++ modsecurity-apache 6 Oct 2015 00:59:16 -0000 1.6 @@ -16,6 +16,8 @@ MYNAME=PHP +cd $(find_src_dir modsecurity) || exit 1 + case $1 in build ) if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_MODSECURITY" = "y" ]; then Index: rpcbind =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rpcbind,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rpcbind 5 Dec 2011 09:11:38 -0000 1.5 +++ rpcbind 6 Oct 2015 00:59:17 -0000 1.6 @@ -16,7 +16,7 @@ case $1 in build ) if [ "$CONFIG_PORTMAP" = "y" ]; then - ./configure --prefix=/usr || exit 1 + ./configure --prefix=/usr --without-systemdsystemunitdir || exit 1 make $PMAKE all || exit 1 fi --- ser DELETED --- Index: grub =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/grub,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- grub 7 Feb 2015 00:34:55 -0000 1.27 +++ grub 6 Oct 2015 00:59:16 -0000 1.28 @@ -18,12 +18,13 @@ case $1 in build ) - patch_from_dir ../grub-patches - - unset CFLAGS - unset CXXFLAGS - export CC="gcc -specs=${WORKDIR}/gcc-specs-default" - ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-nls || exit 1 + export CFLAGS= + export CONF_HOST= + export CXXFLAGS= + ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-nls --disable-werror \ + --disable-grub-emu-usb --disable-efiemu || exit 1 +# --host=i386-unknown-linux-gnu --target=i386-unknown-linux-gnu --build=i386-unknown-linux-gnu --with-platform=pc || exit 1 +# --host=$CONF_HOST --target=$CONF_HOST --build=$CONF_HOST --with-platform=pc || exit 1 make $PMAKE || exit 1 ;; Index: udev =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/udev,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- udev 13 Feb 2015 15:02:13 -0000 1.24 +++ udev 6 Oct 2015 00:59:17 -0000 1.25 @@ -14,17 +14,19 @@ # source functions and config source $MYDIR/settings +cd $(find_src_dir eudev) || exit 1 + case $1 in build ) - #patch_from_file 1 $DL_DIR/src/udev-persistent-net.patch.xz || exit 1 - ./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc --libexecdir=/lib --with-rootprefix='' \ - --bindir=/sbin --disable-introspection --with-systemdsystemunitdir=no --enable-rule_generator || exit 1 - make $PMAKE all || exit 1 - + ./autogen.sh + BLKID_CFLAGS=-I/tools/include BLKID_LIBS='-L/tools/lib -lblkid' ./configure --prefix=/usr --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \ + --sysconfdir=/etc --libexecdir=/lib --with-rootprefix= --with-rootlibdir=/lib --enable-split-usr --enable-libkmod --enable-rule_generator --enable-keymap \ + --disable-introspection --disable-gudev --disable-gtk-doc-html || exit 1 + make $PMAKE || exit 1 + # install this, we need it later make install || exit 1 - - ;; - + ;; + install ) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 --- aide DELETED --- Index: rng-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rng-tools,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rng-tools 5 Dec 2011 09:11:38 -0000 1.5 +++ rng-tools 6 Oct 2015 00:59:17 -0000 1.6 @@ -17,7 +17,8 @@ case $1 in build ) if [ "$CONFIG_RNGTOOLS" = "y" ]; then - ./configure CFLAGS="$CFLAGS -Wall -pipe -02" --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 + #./configure CFLAGS="$CFLAGS -Wall -pipe -02" --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 make $PMAKE all || exit 1 fi Index: create_cd_dirs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- create_cd_dirs 22 Dec 2012 19:14:43 -0000 1.42 +++ create_cd_dirs 6 Oct 2015 00:59:15 -0000 1.43 @@ -63,12 +63,6 @@ mkdir -p $CDDOCDIR - if [ "$CONFIG_DIR_SAP" = "y" ]; then - echo "creating directory structure for SAP" - mkdir $CDDIR/{sapdb,sapmnt,oracle} - mkdir $CDDIR/usr/sap - fi - # create links ln -sf /var/tmp $CDDIR/usr/tmp ln -sf /var/spool $CDDIR/usr/spool Index: libxslt =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libxslt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- libxslt 5 Dec 2011 09:11:38 -0000 1.6 +++ libxslt 6 Oct 2015 00:59:16 -0000 1.7 @@ -16,7 +16,11 @@ case $1 in build ) - CC="gcc -nopie" ./configure --prefix=/usr --localstatedir=/var || exit 1 + if [ "$CONFIG_GCC_HARDENED" = "y" ]; then + CC="gcc -nopie" ./configure --prefix=/usr --localstatedir=/var || exit 1 + else + ./configure --prefix=/usr --localstatedir=/var || exit 1 + fi make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: gcc-4 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gcc-4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gcc-4 13 Dec 2011 19:54:10 -0000 1.11 +++ gcc-4 6 Oct 2015 00:59:16 -0000 1.12 @@ -27,16 +27,9 @@ # and now make sure we use SSP and other stuff when compiling # thanks to Robert Connolly and the HLFS project patch_from_dir ../gcc-hardened || exit 1 - EXTRAOPTIONS="$EXTRAOPTIONS gcc_cv_libc_provides_ssp=yes" - CONFIG_EXTRA="$CONFIG_EXTRA --disable-werror" - - # #Modify GCC to make -fPIC the default: - # cp -v gcc/config/i386/linux.h{,.orig} - # sed 's/^\(#define CC1_SPEC.*\)\("\)$/\1 %{fno-pic|fno-PIC|fpic|fPIC:;:-fPIC}\2/' \ - # gcc/config/i386/linux.h.orig > gcc/config/i386/linux.h - # cp -v gcc/config/i386/x86-64.h{,.orig} - # sed 's/^\(#define CC1_SPEC.*\)\("\)$/\1 %{fno-pic|fno-PIC|fpic|fPIC:;:-fPIC}\2/' \ - # gcc/config/i386/x86-64.h.orig > gcc/config/i386/x86-64.h + #EXTRAOPTIONS="$EXTRAOPTIONS gcc_cv_libc_provides_ssp=yes" + #CONFIG_EXTRA="$CONFIG_EXTRA --disable-werror" + CONFIG_EXTRA="$CONFIG_EXTRA --enable-esp --enable-libssp" fi sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -56,9 +49,6 @@ # install it, so we use the same version everywhere make install || exit 1 - # Install the libiberty header file that is needed by some packages - #install -v -m0644 ../gcc-4*/include/libiberty.h /usr/include - gcc -dumpspecs > $WORKDIR/gcc-specs-hardened ;; Index: mdadm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mdadm,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- mdadm 22 Dec 2012 19:14:43 -0000 1.18 +++ mdadm 6 Oct 2015 00:59:16 -0000 1.19 @@ -18,12 +18,14 @@ build ) if [ "$CONFIG_MDADM" = "y" ]; then if [ ! -f devil-linux-mdadm-patch.done ]; then - #bzcat $DL_DIR/src/mdadm-*.patch.bz2 | patch -p1 || exit 1 + #xzcat $DL_DIR/src/mdadm-*.patch.xz | patch -p1 || exit 1 touch devil-linux-mdadm-patch.done fi + mkdir -p /run/mdadm replace_str Makefile "CWFLAGS = -Wall -Werror" "CWFLAGS = -Wall" # build static version, so we can also use it in initrd - make CC="gcc -D_FORTIFY_SOURCE=0" LDFLAGS=-static STRIP=-s $PMAKE all || exit 1 + #make CC="gcc -D_FORTIFY_SOURCE=0" LDFLAGS=-static STRIP=-s $PMAKE all || exit 1 + make LDFLAGS=-static STRIP=-s $PMAKE all || exit 1 fi ;; --- NEW FILE: open-isns --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/open-isns,v $ # $Revision: 1.1 $ # $Date: 2015/10/06 00:59:16 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE || exit 1 # we have to install this immediately, because this is a library and could be needed by other sources mkdir -p /etc/init.d || exit 1 make install || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: nbd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nbd,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- nbd 5 Dec 2011 09:11:38 -0000 1.8 +++ nbd 6 Oct 2015 00:59:16 -0000 1.9 @@ -16,6 +16,8 @@ MYNAME=ENBD +exit 0 + case $1 in build ) if [ "$CONFIG_ENBD" = "y" ]; then Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kmod 4 Mar 2012 14:20:53 -0000 1.2 +++ kmod 6 Oct 2015 00:59:16 -0000 1.3 @@ -16,13 +16,31 @@ case $1 in build ) - ./configure --prefix=/usr --disable-tools --with-xz --with-zlib || exit 1 + ./configure --prefix=/usr --with-xz --with-zlib || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it make install ;; + install ) + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + + for FILE in depmod insmod lsmod modinfo modprobe rmmod + do + ln -sf kmod $TMPDIR/usr/bin/${FILE} || exit 1 + done + + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + + copy_docs $TMPDIR + copy_files $TMPDIR/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 + ;; + * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" --- ippool DELETED --- --- alsa-driver DELETED --- Index: ptlib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ptlib,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ptlib 5 Dec 2011 09:11:38 -0000 1.2 +++ ptlib 6 Oct 2015 00:59:17 -0000 1.3 @@ -22,7 +22,7 @@ build ) if [ "$CONFIG_PWLIB" = "y" ]; then rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so - export CFLAGS="$CFLAGS -Os" + #export CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -O2" ./configure --prefix=/usr || exit 1 make bothdepend || exit 1 make $PMAKE || exit 1 Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- glibc 5 Dec 2011 14:35:43 -0000 1.62 +++ glibc 6 Oct 2015 00:59:16 -0000 1.63 @@ -24,15 +24,13 @@ mkdir ../glibc-prepare || exit 1 cd ../glibc-prepare || exit 1 - export CFLAGS="$CFLAGS -O2" + export CFLAGS="$CFLAGS -O2 -Wno-error=unused-function" ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/lib/glibc \ - --enable-kernel=2.6.0 --enable-bind-now --enable-stackguard-randomization || exit 1 + --enable-kernel=2.6.32 --enable-bind-now --enable-stackguard-randomization --enable-obsolete-rpc || exit 1 make $PMAKE || exit 1 - - # we have to install this immediately, because this is a library and could be needed by other sources rm -rf $TMPDIR || exit 1 make install install_root=$TMPDIR || exit 1 @@ -62,42 +60,44 @@ mkdir ../glibc-build || exit 1 cd ../glibc-build || exit 1 - CFLAGS="$CFLAGS -O2" + CFLAGS="$CFLAGS -O2 -Wno-error=unused-function" ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/lib/glibc \ - --enable-kernel=2.6.0 --enable-bind-now --enable-stackguard-randomization || exit 1 + --enable-kernel=2.6.32 --enable-bind-now --enable-stackguard-randomization --enable-obsolete-rpc || exit 1 if [ "$CONFIG_GCC_HARDENED" = "y" ]; then + patch_from_dir ../glibc-hardened || exit 1 + # The Glibc libraries can not be built with -fstack-protector[-all], -D_FORTIFY_SOURCE, or -Wl,-z,now. - echo 'build-programs=no -CC = gcc -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie -CXX = g++ -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie -' > configparms - make $PMAKE || exit 1 - rm -v configparms +# echo 'build-programs=no +#CC = gcc -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie +#CXX = g++ -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie +#' > configparms +# make $PMAKE || exit 1 +# rm -v configparms # Glibc links startfiles explicitly. The following will modify the link command used, so that the programs # will be linked to the sharable startfiles, and explicitly use -fPIE. The sln is another statically #linked program, so options are added so it is not compiled as PIC: - echo 'CC = gcc -fPIE -fPIC -CXX = g++ -fPIE -fPIC -CFLAGS-sln.c += -fno-PIC -fno-PIE -+link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \ - $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ - -Wl,-z,combreloc -Wl,-z,relro -Wl,-z,now $(hashstyle-LDFLAGS) \ - $(addprefix $(csu-objpfx),S$(start-installed-name)) \ - $(+preinit) `$(CC) --print-file-name=crtbeginS.o` \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ - $(+preinit) $(link-extra-libs) \ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) `$(CC) --print-file-name=crtendS.o` $(+postinit) -' > configparms +# echo 'CC = gcc -fPIE -fPIC +#CXX = g++ -fPIE -fPIC +#CFLAGS-sln.c += -fno-PIC -fno-PIE +#+link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \ +# $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ +# -Wl,-z,combreloc -Wl,-z,relro -Wl,-z,now $(hashstyle-LDFLAGS) \ +# $(addprefix $(csu-objpfx),S$(start-installed-name)) \ +# $(+preinit) `$(CC) --print-file-name=crtbeginS.o` \ +# $(filter-out $(addprefix $(csu-objpfx),start.o \ +# $(start-installed-name))\ +# $(+preinit) $(link-extra-libs) \ +# $(common-objpfx)libc% $(+postinit),$^) \ +# $(link-extra-libs) $(link-libc) `$(CC) --print-file-name=crtendS.o` $(+postinit) +#' > configparms make $PMAKE || exit 1 - rm -v configparms -echo 'CC = gcc -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie -CXX = g++ -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie -' > configparms +# rm -v configparms +#echo 'CC = gcc -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie +#CXX = g++ -fPIC -fno-stack-protector -U_FORTIFY_SOURCE -nonow -nopie +#' > configparms else make $PMAKE || exit 1 fi Index: keepalived =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/keepalived,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- keepalived 5 Dec 2011 09:11:38 -0000 1.5 +++ keepalived 6 Oct 2015 00:59:16 -0000 1.6 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_KEEPALIVED" = "y" ]; then - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-kernel-dir=/usr/include/linux || exit 1 make $PMAKE || exit 1 Index: dvd+rw-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dvd+rw-tools,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dvd+rw-tools 6 Jan 2010 14:53:27 -0000 1.6 +++ dvd+rw-tools 6 Oct 2015 00:59:15 -0000 1.7 @@ -19,7 +19,7 @@ if [ "$CONFIG_DVDRWTOOLS" = "y" ]; then if [ ! -f dl_patch_done ]; then - bzcat $DL_DIR/src/dvd+rw-tools-7.1-limits.patch.bz2 | patch -p1 || exit 1 + xzcat $DL_DIR/src/dvd+rw-tools-7.1-limits.patch.xz | patch -p1 || exit 1 touch dl_patch_done fi Index: bridge-utils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bridge-utils,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- bridge-utils 5 Dec 2011 09:11:37 -0000 1.19 +++ bridge-utils 6 Oct 2015 00:59:15 -0000 1.20 @@ -16,13 +16,15 @@ MYNAME=BRIDGE_UTILS +exit 0 + case $1 in build ) if [ "$CONFIG_BRIDGE_UTILS" = "y" ]; then + patch_from_file 1 $DL_DIR/src/bridge-utils-1.5-linux_3.8_fix-1.patch.xz || exit 1 autoconf || exit 1 - ./configure --prefix=/usr || exit 1 - make $PMAKE all|| exit 1 - + ./configure --prefix=/usr --with-linux-headers=/usr/include/linux || exit 1 + make $PMAKE all || exit 1 fi ;; --- ucspi-tcp DELETED --- Index: pam_radius =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pam_radius,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pam_radius 5 Dec 2011 09:11:38 -0000 1.10 +++ pam_radius 6 Oct 2015 00:59:16 -0000 1.11 @@ -16,7 +16,7 @@ case $1 in build ) - + ./configure --prefix=/usr || exit 1 make CC="gcc -fno-stack-protector" $PMAKE || exit 1 # install it in local system, because other programs could need it Index: GeoIP =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/GeoIP,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GeoIP 10 Dec 2011 15:25:55 -0000 1.4 +++ GeoIP 6 Oct 2015 00:59:14 -0000 1.5 @@ -37,8 +37,9 @@ rm -rf $TMPDIR/usr/include || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 rm -rf $TMPDIR/usr/share || exit 1 - copy_files $TMPDIR/etc $ETCDIR/ || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 + mkdir -p $CDDIR/usr/share/GeoIP || exit 1 + cp -dpvR data/GeoIP.dat $CDDIR/usr/share/GeoIP/ || exit 1 rm -rf $TMPDIR || exit 1 fi ;; --- ndiswrapper DELETED --- Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- dhcp 5 Dec 2011 09:11:37 -0000 1.30 +++ dhcp 6 Oct 2015 00:59:15 -0000 1.31 @@ -20,11 +20,15 @@ build ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then #if [ ! -f .dl_patch_done ]; then - # bzcat $DL_DIR/src/dhcp-3.0.1-fix_gcc_3.4.3_compile_error-1.patch.bz2 | patch -p1 || exit 1 + # xzcat $DL_DIR/src/dhcp-3.0.1-fix_gcc_3.4.3_compile_error-1.patch.xz | patch -p1 || exit 1 # touch .dl_patch_done #fi - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --disable-nls --enable-paranoia || exit 1 + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-paranoia || exit 1 + cd bind || exit 1 + tar -xzf bind.tar.gz || exit 1 + make all || exit 1 + cd .. || exit 1 make $PMAKE all || exit 1 fi --- wvdial DELETED --- Index: irqbalance =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/irqbalance,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- irqbalance 5 Dec 2011 09:11:38 -0000 1.2 +++ irqbalance 6 Oct 2015 00:59:16 -0000 1.3 @@ -16,7 +16,9 @@ case $1 in build ) if [ "$CONFIG_IRQBALANCE" = "y" ]; then - make ; make || exit 1 + ./autogen.sh || exit 1 + ./configure --prefix=/usr || exit 1 + make || exit 1 fi ;; --- vlan DELETED --- --- NEW FILE: bc --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/bc,v $ # $Revision: 1.1 $ # $Date: 2015/10/06 00:59:15 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in prepare ) ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 make install || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: ntp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ntp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ntp 5 Dec 2011 09:11:38 -0000 1.29 +++ ntp 6 Oct 2015 00:59:16 -0000 1.30 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_NTP" = "y" ]; then if [ ! -f dl-patch.done ]; then - bzcat $DL_DIR/src/ntp-4.2.4_p6-nano.patch.bz2 | patch -p0 || exit 1 + xzcat $DL_DIR/src/ntp-4.2.4_p6-nano.patch.xz | patch -p0 || exit 1 touch dl-patch.done fi ./configure --prefix=/usr --enable-all-clocks --enable-parse-clocks || exit 1 --- e100 DELETED --- Index: xerces-c =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xerces-c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xerces-c 24 Jun 2015 01:27:46 -0000 1.1 +++ xerces-c 6 Oct 2015 00:59:18 -0000 1.2 @@ -16,7 +16,7 @@ case $1 in build ) - LDFLAGS=-liconv ./configure --prefix=/usr || exit 1 + ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: procmail =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/procmail,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- procmail 5 Dec 2011 09:11:38 -0000 1.5 +++ procmail 6 Oct 2015 00:59:17 -0000 1.6 @@ -17,7 +17,7 @@ build ) if [ "$CONFIG_PROCMAIL" = "y" ]; then if [ ! -f dl-patch.done ]; then - bzcat $DL_DIR/src/procmail-3.22-glibc-2.10.patch.bz2 | patch -p1 || exit 1 + xzcat $DL_DIR/src/procmail-3.22-glibc-2.10.patch.xz | patch -p1 || exit 1 touch dl-patch.done fi make $PMAKE all LOCKINGTEST='/tmp .' || exit 1 Index: gawk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gawk,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- gawk 5 Dec 2011 09:11:38 -0000 1.14 +++ gawk 6 Oct 2015 00:59:16 -0000 1.15 @@ -17,7 +17,7 @@ case $1 in build ) if [ ! -f .DL-patch.done ]; then - #bzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.bz2 | patch -p1 || exit 1 + #xzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.xz | patch -p1 || exit 1 touch .DL-patch.done fi ./configure --prefix=/usr --libexecdir=/usr/bin --disable-nls || exit 1 --- ssmtp DELETED --- --- fprobe-ulog DELETED --- --- dev86 DELETED --- --- wvstreams DELETED --- --- jftpgw DELETED --- Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- build.sh 21 Jun 2015 13:23:35 -0000 1.118 +++ build.sh 6 Oct 2015 00:59:15 -0000 1.119 @@ -5,6 +5,11 @@ # # http://www.devil-linux.org +if [ -f /etc/resolv.conf ]; then + echo "Please remove /etc/resolv.conf first" + exit 1 +fi + # get the directoryname of the script MYDIR=${0%/*} BASE=${0##*/} Index: sagator =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sagator,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- sagator 5 Dec 2011 09:11:38 -0000 1.28 +++ sagator 6 Oct 2015 00:59:17 -0000 1.29 @@ -19,16 +19,8 @@ case $1 in build ) if [ "$CONFIG_SAGATOR" = "y" ]; then - patch_from_file 1 $DL_DIR/src/sagator-milter_umask.patch.bz2 || exit 1 - - #replace_str Makefile python2.2 python2.3 - #export PYTHONHOME=$WORKDIR/Python-install/usr - #export PATH=$WORKDIR/Python-install/usr/bin:$PATH - #export APACHE_ROOT=/etc/apache2 #[ "$CONFIG_DSPAM" = "y" ] && eval "export DSPAM=yes; export DSPAM_PREFIX=/usr" ./configure --prefix /usr || exit 1 - #replace_str libclamav/Makefile gcc "gcc -D_FORTIFY_SOURCE=0" - #replace_str pydspam/Makefile gcc "gcc -D_FORTIFY_SOURCE=0" make $PMAKE CP="cp -Rf" all || exit 1 fi Index: openssl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openssl,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- openssl 5 Dec 2011 09:11:38 -0000 1.34 +++ openssl 6 Oct 2015 00:59:16 -0000 1.35 @@ -19,8 +19,8 @@ case $1 in build ) #if [ ! -e .patches_done ]; then - # bzcat $SRCDIR/openssl-0.9.8b-sha.diff.bz2 | patch -p1 || exit 1 - # bzcat $SRCDIR/openssl-0.9.8e-engine.diff.bz2 | patch -p1 || exit 1 + # xzcat $SRCDIR/openssl-0.9.8b-sha.diff.xz | patch -p1 || exit 1 + # xzcat $SRCDIR/openssl-0.9.8e-engine.diff.xz | patch -p1 || exit 1 # touch .patches_done #fi Index: acl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/acl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- acl 5 Dec 2011 09:11:37 -0000 1.20 +++ acl 6 Oct 2015 00:59:14 -0000 1.21 @@ -18,12 +18,16 @@ case $1 in build ) - autoconf || exit 1 ./configure --prefix=/usr --enable-shared --enable-gettext=no || exit 1 make $PMAKE || exit 1 # install it, because it's needed by some programs - make install install-dev install-lib || exit 1 - + #we need to do a bit of a workaround, otherwise the library might get installed with 0 bytes + make prefix=$TMPDIR/usr install install-dev install-lib || exit 1 + cd $TMPDIR/ + tar -cf tmp.tar usr || exit 1 + tar -C / -xvf tmp.tar || exit 1 + cd $WORKDIR || exit 1 + rm -rf $TMPDIR ;; install ) --- usbat-02 DELETED --- Index: iptraf =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptraf,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- iptraf 6 Mar 2012 19:50:39 -0000 1.22 +++ iptraf 6 Oct 2015 00:59:16 -0000 1.23 @@ -19,14 +19,14 @@ case $1 in build ) if [ "$CONFIG_IPTRAF" = "y" ]; then - patch_from_file 1 $DL_DIR/src/iptraf-include-fix.diff.bz2 || exit 1 - patch_from_file 1 $DL_DIR/src/iptraf-add-devnames.diff.bz2 || exit 1 - patch_from_file 1 $DL_DIR/src/iptraf-3.0.0-vlan.diff.bz2 || exit 1 - patch_from_file 1 $DL_DIR/src/iptraf-tun-65534_diff.bz2 || exit 1 - patch_from_file 1 $DL_DIR/src/iptraf-interfaces-sorting_diff.bz2 || exit 1 - patch_from_file 1 $DL_DIR/src/iptraf-ltrim-for-64bit_diff.bz2 || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-include-fix.diff.xz || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-add-devnames.diff.xz || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-3.0.0-vlan.diff.xz || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-tun-65534_diff.xz || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-interfaces-sorting_diff.xz || exit 1 + patch_from_file 1 $DL_DIR/src/iptraf-ltrim-for-64bit_diff.xz || exit 1 pushd /usr/include/linux || exit 1 - patch_from_file 0 $DL_DIR/src/iptraf-netdevice-fix.diff.bz2 || exit 1 + patch_from_file 0 $DL_DIR/src/iptraf-netdevice-fix.diff.xz || exit 1 popd > /dev/null replace_str ./src/Makefile /usr/local/bin /usr/bin --- jfsutils DELETED --- Index: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- heartbeat 24 Jun 2015 23:51:26 -0000 1.26 +++ heartbeat 6 Oct 2015 00:59:16 -0000 1.27 @@ -27,7 +27,7 @@ SNMP="--disable-snmp" fi - patch_from_file 1 $DL_DIR/src/heartbeat-2.1.4_install_fix.patch.bz2 || exit 1 + patch_from_file 1 $DL_DIR/src/heartbeat-2.1.4_install_fix.patch.xz || exit 1 #CFLAGS="-D_FORTIFY_SOURCE=0" #CC="gcc -nopie -fno-stack-protector" Index: open-iscsi =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/open-iscsi,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- open-iscsi 5 Dec 2011 09:11:38 -0000 1.4 +++ open-iscsi 6 Oct 2015 00:59:16 -0000 1.5 @@ -17,10 +17,6 @@ case $1 in build ) if [ "$CONFIG_ISCSI_INIT" = "y" ]; then - #if [ ! -f .patch.done ]; then - # bzcat $SRCDIR/open-iscsi-destdir.patch.bz2 | patch -p0 || exit 1 - # touch .patch.done - #fi make KSRC=$KERNELDIR all || exit 1 fi --- netacct-mysql DELETED --- --- alsa-utils DELETED --- Index: inetutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/inetutils,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- inetutils 5 Dec 2011 09:11:38 -0000 1.10 +++ inetutils 6 Oct 2015 00:59:16 -0000 1.11 @@ -18,14 +18,15 @@ build ) if [ ! -f devil-linux-patches.done ]; then touch devil-linux-patches.done - #bzcat $DL_DIR/src/inetutils*.patch.bz2 | patch -p1 || exit 1 + #xzcat $DL_DIR/src/inetutils*.patch.xz | patch -p1 || exit 1 fi ./configure --prefix=/usr --libexecdir=/usr/sbin \ --sysconfdir=/etc --localstatedir=/var \ --disable-logger --disable-syslogd \ --disable-whois --disable-servers \ - --disable-ifconfig --disable-ping || exit 1 + --disable-ifconfig --disable-rlogin \ + --disable-rcp --disable-rexec --disable-rsh || exit 1 make $PMAKE all || exit 1 @@ -34,8 +35,6 @@ install ) rm -rf $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 - #mkdir -p $TMPDIR/bin/ || exit 1 - #mv $TMPDIR/usr/bin/ping $TMPDIR/bin/ || exit 1 copy_docs $TMPDIR cp -vdpR $TMPDIR/* $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 --- patch-o-matic DELETED --- Index: xz =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xz,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- xz 5 Dec 2011 09:11:38 -0000 1.5 +++ xz 6 Oct 2015 00:59:18 -0000 1.6 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr --bindir=/bin --disable-nls || exit 1 + ./configure --prefix=/usr --bindir=/bin --disable-nls || exit 1 make $PMAKE || exit 1 make install --- ucarp DELETED --- Index: ppp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ppp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ppp 5 Dec 2011 09:11:38 -0000 1.26 +++ ppp 6 Oct 2015 00:59:17 -0000 1.27 @@ -25,7 +25,7 @@ fi if [ "$CONFIG_PPTP_MPPE_MPPC" = "y" ]; then if [ ! -f devil-linux-mppe_mppc-patch.done ]; then - bzcat $SRCDIR/ppp-*-mppe-mppc*patch.bz2 | patch -p1 || exit 1 + xzcat $SRCDIR/ppp-*-mppe-mppc*patch.xz | patch -p1 || exit 1 touch devil-linux-mppe_mppc-patch.done fi fi Index: mtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mtools,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mtools 5 Dec 2011 09:11:38 -0000 1.16 +++ mtools 6 Oct 2015 00:59:16 -0000 1.17 @@ -18,7 +18,7 @@ case $1 in build ) if [ "$CONFIG_MTOOLS" = "y" ]; then - LDFLAGS=-liconv ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 make $PMAKE all || exit 1 fi Index: watchdog =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- watchdog 5 Dec 2011 09:11:38 -0000 1.24 +++ watchdog 6 Oct 2015 00:59:18 -0000 1.25 @@ -19,7 +19,7 @@ build ) if [ "$CONFIG_WATCHDOG" = "y" ]; then if [ ! -f watchdog_patch_done ]; then - #bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1 + #xzcat $DL_DIR/src/watchdog-errno.patch.xz | patch -p1 || exit 1 touch watchdog_patch_done fi add_kernel_options $MYDIR/config/config_watchdog --- xmbmon DELETED --- --- rpm DELETED --- Index: gpm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gpm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gpm 5 Dec 2011 09:11:38 -0000 1.11 +++ gpm 6 Oct 2015 00:59:16 -0000 1.12 @@ -20,7 +20,8 @@ build ) if [ "$CONFIG_GPM" = "y" ]; then # correct doc/Makefile.in in case makeinfo is missing, bug in gpm-1.20.1 - sed -i s/.'"$(MAKEINFO)" != "no"'/' "$(MAKEINFO)" != "no --no-split"'/ doc/Makefile.in + #sed -i s/.'"$(MAKEINFO)" != "no"'/' "$(MAKEINFO)" != "no --no-split"'/ doc/Makefile.in + ./autogen.sh || exit 1 ./configure --prefix=/usr --sysconfdir=/etc || exit 1 # parallel build doesn't work LDFLAGS="-lm" make all || exit 1 Index: syslinux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- syslinux 5 Dec 2011 09:11:38 -0000 1.30 +++ syslinux 6 Oct 2015 00:59:17 -0000 1.31 @@ -16,18 +16,14 @@ case $1 in build ) - #if [ "$CONFIG_GCC_HARDENED" = "y" ]; then - # make $PMAKE CC="gcc -fno-PIE" install|| exit 1 - #else - make $PMAKE install|| exit 1 - #fi - + make $PMAKE all || exit 1 #instal it, we need it later make install || exit 1 ;; install ) + cd bios cp -v core/isolinux.bin $CDDIR/boot || exit 1 #cp -dp ppmtolss16 /usr/bin || exit 1 @@ -37,6 +33,11 @@ cp -v core/ldlinux.sys $CDDIR/boot/syslinux || exit 1 cp -v mbr/mbr.bin $CDDIR/boot/syslinux || exit 1 cp -v linux/syslinux $CDDIR/boot/syslinux || exit 1 + cp -v com32/elflink/ldlinux/ldlinux.c32 $CDDIR/boot/syslinux || exit 1 + cp -v com32/libutil/libutil.c32 $CDDIR/boot/syslinux || exit 1 + cp -v com32/lib/libcom32.c32 $CDDIR/boot/syslinux || exit 1 + cp -v com32/modules/disk.c32 $CDDIR/boot/syslinux || exit 1 + cp -v com32/modules/linux.c32 $CDDIR/boot/syslinux || exit 1 ;; * ) Index: yp-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/yp-tools,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- yp-tools 5 Dec 2011 09:11:38 -0000 1.7 +++ yp-tools 6 Oct 2015 00:59:18 -0000 1.8 @@ -20,8 +20,11 @@ build ) if [ "$CONFIG_NIS" = "y" ]; then ./configure --prefix=/usr --sysconfdir=/etc || exit 1 + mkdir -p nss_nis6/resolv || exit 1 + cp $(find_src_dir glibc)/resolv/mapv4v6addr.h nss_nis6/resolv/ || exit 1 make $PMAKE all || exit 1 - + + make install || exit 1 fi ;; Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- prepare 24 Jan 2015 21:08:15 -000... [truncated message content] |
