wok rev 7274
busybox-pam must be sync'ed with busybox
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 15 13:54:23 2010 +0100 (2010-11-15) |
parents | 29f1d0caaa4d |
children | 46ca179cb85b |
files | busybox-pam/receipt busybox/receipt qemu/receipt |
line diff
1.1 --- a/busybox-pam/receipt Mon Nov 15 06:25:46 2010 +0000 1.2 +++ b/busybox-pam/receipt Mon Nov 15 13:54:23 2010 +0100 1.3 @@ -6,83 +6,18 @@ 1.4 SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." 1.5 MAINTAINER="pascal.bellard@slitaz.org" 1.6 DEPENDS="slitaz-base-files glibc-base pam" 1.7 -BUILD_DEPENDS="bzip2 pam pam-dev" 1.8 -SOURCE="busybox" 1.9 -TARBALL="$SOURCE-$VERSION.tar.bz2" 1.10 +WANTED="busybox" 1.11 WEB_SITE="http://www.busybox.net/" 1.12 -WGET_URL="http://www.busybox.net/downloads/$TARBALL" 1.13 CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf /etc/resolv.conf \ 1.14 /etc/pam.d" 1.15 PROVIDE="busybox:pam" 1.16 1.17 -# Rules to configure and make the package. 1.18 -compile_rules() 1.19 -{ 1.20 - cd $src 1.21 - while read file; do 1.22 - [ -f done.$file ] && continue 1.23 - echo "Apply $file..." 1.24 - patch -p1 < $WOK/$SOURCE/stuff/$SOURCE-$VERSION-$file || return 1 1.25 - touch done.$file 1.26 - done <<EOT 1.27 -cpio-mkdir.u 1.28 -tar.u 1.29 -stat.u 1.30 -ris.u 1.31 -depmod.u 1.32 -zmodules.u 1.33 -usage.u 1.34 -EOT 1.35 - cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config 1.36 - sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config 1.37 - make oldconfig 1.38 - if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.39 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 1.40 - # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.41 - make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.42 - else 1.43 - make -j 4 && make install 1.44 - fi 1.45 - echo "Chmod 4755 on busybox binary..." 1.46 - chmod 4755 _install/bin/busybox 1.47 -} 1.48 - 1.49 # Rules to gen a SliTaz package suitable for Tazpkg. 1.50 genpkg_rules() 1.51 { 1.52 - cp -a $src/_install/* $fs 1.53 - cp -a stuff/etc $fs 1.54 - mkdir -p $fs/etc/init.d 1.55 - # Busybox config files. 1.56 - fs=$WOK/$PACKAGE/taz/$PACKAGE-$VERSION/fs 1.57 - busybox_stuff=$WOK/$SOURCE/stuff 1.58 - cp $busybox_stuff/busybox.conf $fs/etc 1.59 - chmod 600 $fs/etc/busybox.conf 1.60 - cp $busybox_stuff/dnsd.conf $fs/etc 1.61 - cp $busybox_stuff/udhcpd.conf $fs/etc 1.62 - touch $fs/etc/resolv.conf 1.63 - cp $busybox_stuff/inetd.conf $fs/etc 1.64 - cp $busybox_stuff/daemon $fs/etc/init.d 1.65 - for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \ 1.66 - udhcpd zcip ; do 1.67 - grep -qi config_$i=y $src/.config && 1.68 - ln -s daemon $fs/etc/init.d/$i 1.69 - done 1.70 - cp $busybox_stuff/init $fs 1.71 - rm $fs/linuxrc 1.72 - mkdir -p $fs/etc/modprobe.d 1.73 - # Udhcpc stuff. 1.74 - mkdir -p $fs/usr/share/udhcpc 1.75 - cp $busybox_stuff/udhcp.script $fs/usr/share/udhcpc/default.script 1.76 - chmod +x $fs/usr/share/udhcpc/default.script 1.77 - # ZeroConf stuff. 1.78 - cp $busybox_stuff/zcip.script $fs/etc 1.79 - # Httpd stuff. 1.80 - cp $busybox_stuff/httpd_helper.sh $fs/usr/bin 1.81 - chmod +x $fs/usr/bin/httpd_helper.sh 1.82 - # .desktop stuff 1.83 - mkdir -p $fs/usr/share 1.84 - cp -a $busybox_stuff/applications $fs/usr/share 1.85 + cp -a $WOK/$WANTED/taz/$WANTED-$VERSION/fs/* $fs 1.86 + cp -a $src/busybox-pam $fs/bin/busybox 1.87 + cp -a stuff/* $fs 1.88 } 1.89 1.90 # Force glibc-2.7 reinstall if 2.3.6 still in use.
2.1 --- a/busybox/receipt Mon Nov 15 06:25:46 2010 +0000 2.2 +++ b/busybox/receipt Mon Nov 15 13:54:23 2010 +0100 2.3 @@ -6,7 +6,7 @@ 2.4 SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." 2.5 MAINTAINER="pascal.bellard@slitaz.org" 2.6 DEPENDS="slitaz-base-files glibc-base" 2.7 -BUILD_DEPENDS="bzip2" 2.8 +BUILD_DEPENDS="bzip2 pam pam-dev" 2.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.10 WEB_SITE="http://www.busybox.net/" 2.11 WGET_URL="http://www.busybox.net/downloads/$TARBALL" 2.12 @@ -42,6 +42,17 @@ 2.13 fi 2.14 echo "Chmod 4755 on busybox binary..." 2.15 chmod 4755 _install/bin/busybox 2.16 + sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config 2.17 + make oldconfig 2.18 + if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 2.19 + # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 2.20 + # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 2.21 + make -j 4 "CFLAGS=-O0" 2.22 + else 2.23 + make -j 4 2.24 + fi 2.25 + mv busybox busybox-pam 2.26 + chmod 4755 busybox-pam 2.27 } 2.28 2.29 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- a/qemu/receipt Mon Nov 15 06:25:46 2010 +0000 3.2 +++ b/qemu/receipt Mon Nov 15 13:54:23 2010 +0100 3.3 @@ -9,7 +9,7 @@ 3.4 WEB_SITE="http://www.nongnu.org/qemu/" 3.5 WGET_URL="http://download.savannah.gnu.org/releases/qemu/$TARBALL" 3.6 BUILD_DEPENDS="alsa-lib-dev gettext libsdl-dev" 3.7 -DEPENDS="alsa-lib gnutls libsdl zlib bluez libtasn1" 3.8 +DEPENDS="alsa-lib gnutls libsdl zlib bluez libtasn1 libsasl" 3.9 TAGS="virtualization" 3.10 3.11 # Rules to configure and make the package.