wok diff busybox-pam/receipt @ rev 5684

Up busybox (1.16.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jun 04 17:00:07 2010 +0200 (2010-06-04)
parents 94d647af395f
children 52dc580d9edb
line diff
     1.1 --- a/busybox-pam/receipt	Mon Mar 01 13:35:34 2010 +0100
     1.2 +++ b/busybox-pam/receipt	Fri Jun 04 17:00:07 2010 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="busybox-pam"
     1.7 -VERSION="1.12.0"
     1.8 +VERSION="1.16.1"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -25,30 +25,21 @@
    1.13  	touch done.$file
    1.14      done <<EOT
    1.15  vcsa2txt.u
    1.16 -dhcpc.u
    1.17 +ftpd.u
    1.18  cpio-mkdir.u
    1.19  tar.u
    1.20  stat.u
    1.21 -zmodules.u
    1.22 -modinfo.u
    1.23 -modprobe.u
    1.24 -paths.u
    1.25 -mkswap.u
    1.26 -install.u
    1.27 -basename.u
    1.28 -unlzma.u
    1.29 -replay.u
    1.30  ris.u
    1.31  dpkg_deb.u
    1.32 -ionice.u
    1.33  syslogd.u
    1.34 -iptunnel.u
    1.35 -rpm2cpio.u
    1.36 +modinfo.u
    1.37 +zmodules.u
    1.38  EOT
    1.39      cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config
    1.40      sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
    1.41      make oldconfig
    1.42 -    make && make install
    1.43 +    # "CFLAGS=-O0" is a workaround for GCC 4.5.0
    1.44 +    make "CFLAGS=-O0" && make "CFLAGS=-O0" install
    1.45      echo "Chmod 4755 on busybox binary..."
    1.46      chmod 4755 _install/bin/busybox
    1.47  }
    1.48 @@ -72,20 +63,24 @@
    1.49      cp stuff/udhcpd.conf $fs/etc
    1.50      touch $fs/etc/resolv.conf
    1.51      cp stuff/inetd.conf $fs/etc
    1.52 -    cp stuff/dnsd $fs/etc/init.d
    1.53 -    cp stuff/udhcpd $fs/etc/init.d
    1.54 -    cp stuff/inetd $fs/etc/init.d
    1.55 -    cp stuff/zcip $fs/etc/init.d
    1.56 +    cp stuff/daemon $fs/etc/init.d
    1.57 +    for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \
    1.58 +    	     udhcpd zcip ; do
    1.59 +	grep -qi config_$i=y $src/.config &&
    1.60 +	ln -s daemon $fs/etc/init.d/$i
    1.61 +    done
    1.62      cp stuff/init $fs
    1.63      rm $fs/linuxrc
    1.64      mkdir -p $fs/etc/modprobe.d
    1.65      # Udhcpc stuff.
    1.66      mkdir -p $fs/usr/share/udhcpc
    1.67 -    cp stuff/udhcp.script \
    1.68 -    $fs/usr/share/udhcpc/default.script
    1.69 +    cp stuff/udhcp.script $fs/usr/share/udhcpc/default.script
    1.70      chmod +x $fs/usr/share/udhcpc/default.script
    1.71      # ZeroConf stuff.
    1.72      cp stuff/zcip.script $fs/etc
    1.73 +    # Httpd stuff.
    1.74 +    cp stuff/httpd_helper.sh $fs/usr/bin
    1.75 +    chmod +x $fs/usr/bin/httpd_helper.sh
    1.76      # .desktop stuff
    1.77      mkdir -p $fs/usr/share
    1.78      cp -a stuff/applications $fs/usr/share