wok-next rev 20281
remove netatalk-pam, partimage-pam, openssh-pam
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Nov 08 14:51:34 2017 +0100 (2017-11-08) |
| parents | d2dfaae2aa88 |
| children | 3f45d23a4aa6 |
| files | netatalk-pam/receipt netatalk-pam/stuff/etc/init.d/netatalk netatalk-pam/stuff/etc/pam.d/netatalk netatalk/receipt netatalk/stuff/etc/pam.d/netatalk openssh-pam/receipt openssh/receipt partimage-pam/receipt partimage-pam/stuff/partimage-0.6.7_gcc4.u partimage/receipt |
line diff
1.1 --- a/netatalk-pam/receipt Wed Nov 08 14:41:47 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,66 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="netatalk-pam" 1.7 -VERSION="2.2.3" 1.8 -CATEGORY="system-tools" 1.9 -SHORT_DESC="The AppleTalk Protocol Suite using PAM." 1.10 -MAINTAINER="pascal.bellard@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -SOURCE="netatalk" 1.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 1.14 -WEB_SITE="http://netatalk.sourceforge.net/" 1.15 -WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 1.16 -CONFIG_FILES="/etc/netatalk/AppleVolumes.* /etc/netatalk/*.conf" 1.17 -PROVIDE="netatalk:pam" 1.18 - 1.19 -DEPENDS="perl libdb libcrypto cups gnutls libgcrypt libgpg-error \ 1.20 -libwrap zlib pam libcomerr3" 1.21 -BUILD_DEPENDS="db-dev libcrypto-dev pam pam-dev file" 1.22 - 1.23 -# Rules to configure and make the package. 1.24 -compile_rules() 1.25 -{ 1.26 - cd $src 1.27 - ./configure --with-pam --prefix=/usr --sysconfdir=/etc \ 1.28 - --libexecdir=/usr/lib/netatalk \ 1.29 - --mandir=/usr/share/man $CONFIGURE_ARGS && 1.30 - make && 1.31 - make DESTDIR=$DESTDIR install 1.32 -} 1.33 - 1.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.35 -genpkg_rules() 1.36 -{ 1.37 - mkdir -p $fs/usr/share $fs/usr/lib 1.38 - cp -a $install/usr/bin $fs/usr 1.39 - cp -a $install/usr/sbin $fs/usr 1.40 - #cp -a $install/usr/lib/netatalk $fs/usr/lib 1.41 - cp -a $install/etc $fs 1.42 - cp -a $stuff/etc $fs 1.43 - rm -f $fs/etc/netatalk/uams/*a 1.44 -} 1.45 - 1.46 -# Pre and post install commands for Tazpkg. 1.47 -post_install() 1.48 -{ 1.49 - cat <<EOF 1.50 ----- 1.51 -To start $PACKAGE server you can run : 1.52 - 1.53 - /etc/init.d/$PACKAGE start 1.54 - 1.55 -Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf 1.56 ----- 1.57 -EOF 1.58 -} 1.59 - 1.60 -# Overlap busybox 1.61 -pre_install() 1.62 -{ 1.63 - rm -f "$1/usr/bin/timeout" 1.64 -} 1.65 - 1.66 -post_remove() 1.67 -{ 1.68 - ln -s /bin/busybox "$1/usr/bin/timeout" 1.69 -}
2.1 --- a/netatalk-pam/stuff/etc/init.d/netatalk Wed Nov 08 14:41:47 2017 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,80 +0,0 @@ 2.4 -#!/bin/sh 2.5 -# Start, stop and restart the netatalk daemons on SliTaz, at boot time or 2.6 -# with the command line. 2.7 -# 2.8 -# To start netatalk at boot time, just put the right name in the $RUN_DAEMONS 2.9 -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf. 2.10 -# 2.11 -. /etc/init.d/rc.functions 2.12 - 2.13 -NAME=atalkd 2.14 -DESC="$(_ 'Netatalk daemons')" 2.15 -PIDFILE=/var/run/$NAME.pid 2.16 -AFPD_UAMLIST="-U uams_dhx.so,uams_clrtxt.so,uams_randnum.so" 2.17 -AFPD_GUEST=nobody 2.18 -AFPD_MAX_CLIENTS=50 2.19 -ATALK_ZONE= 2.20 -ATALK_NAME=$(hostname -s) 2.21 -ATALK_BGROUND=no 2.22 - 2.23 -. /etc/netatalk/netatalk.conf 2.24 - 2.25 -# Start Netatalk servers. 2.26 -atalk_startup() 2.27 -{ 2.28 - if [ "$ATALKD_RUN" == "yes" ]; then 2.29 - modprobe appletalk 2.30 - atalkd 2.31 - pidof atalkd > $PIDFILE 2.32 - 2.33 - # register workstation 2.34 - nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE" 2.35 - nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE" 2.36 - 2.37 - [ "$PAPD_RUN" == "yes" ] && papd 2.38 - [ "$TIMELORD_RUN" == "yes" ] && timelord 2.39 - fi 2.40 - 2.41 - [ "$AFPD_RUN" == "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ 2.42 - -c $AFPD_MAX_CLIENTS -n "$ATALK_NAME$ATALK_ZONE" 2.43 -} 2.44 - 2.45 -case "$1" in 2.46 - start) 2.47 - if active_pidfile $PIDFILE $NAME ; then 2.48 - _ '%s is already running.' $NAME 2.49 - exit 1 2.50 - fi 2.51 - action 'Starting %s: %s...' "$DESC" $NAME 2.52 - if [ "$ATALK_BGROUND" == "yes" ]; then 2.53 - atalk_startup >/dev/null & 2.54 - else 2.55 - atalk_startup 2.56 - fi 2.57 - status 2.58 - ;; 2.59 - stop) 2.60 - if ! active_pidfile $PIDFILE $NAME ; then 2.61 - _ '%s is not running.' $NAME 2.62 - exit 1 2.63 - fi 2.64 - action 'Stopping %s: %s...' "$DESC" $NAME 2.65 - killall afpd 2.66 - killall papd 2.67 - killall timelord 2.68 - killall atalkd 2.69 - status 2.70 - ;; 2.71 - restart) 2.72 - $0 start 2.73 - sleep 2 2.74 - $0 stop 2.75 - ;; 2.76 - *) 2.77 - emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 2.78 - newline 2.79 - exit 1 2.80 - ;; 2.81 -esac 2.82 - 2.83 -exit 0
3.1 --- a/netatalk-pam/stuff/etc/pam.d/netatalk Wed Nov 08 14:41:47 2017 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,7 +0,0 @@ 3.4 -#%PAM-1.0 3.5 -# specify the PAM netatalk behaviour 3.6 - 3.7 -auth required pam_unix.so shadow 3.8 -account required pam_unix.so 3.9 -password required pam_unix.so md5 shadow use_authtok 3.10 -session required pam_unix.so
4.1 --- a/netatalk/receipt Wed Nov 08 14:41:47 2017 +0100 4.2 +++ b/netatalk/receipt Wed Nov 08 14:51:34 2017 +0100 4.3 @@ -1,4 +1,4 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="netatalk" 4.8 VERSION="2.2.3" 4.9 @@ -11,45 +11,80 @@ 4.10 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 4.11 CONFIG_FILES="/etc/netatalk/AppleVolumes.* /etc/netatalk/*.conf" 4.12 4.13 -DEPENDS="perl libdb libcrypto cups gnutls libgcrypt libgpg-error \ 4.14 -libwrap zlib libcomerr3" 4.15 -BUILD_DEPENDS="db-dev libcrypto-dev file" 4.16 +BUILD_DEPENDS="db-dev libcrypto-dev file pam-dev" 4.17 +SPLIT="netatalk netatalk-pam" 4.18 4.19 # Rules to configure and make the package. 4.20 compile_rules() 4.21 { 4.22 - cd $src 4.23 - #sed -i -e 's/pam =/pam_x =/' -e 's/USE_PAM, 1,/USE_PAM, 0,/' \ 4.24 - # -e 's/pam_so =/pam_so_x =/' configure.in 4.25 + cp -a $src $src-pam 4.26 ./configure --without-pam --prefix=/usr --sysconfdir=/etc \ 4.27 - --libexecdir=/usr/lib/netatalk \ 4.28 - --mandir=/usr/share/man $CONFIGURE_ARGS && 4.29 + --libexecdir=/usr/lib/netatalk \ 4.30 + --mandir=/usr/share/man $CONFIGURE_ARGS && 4.31 make && 4.32 make DESTDIR=$DESTDIR install 4.33 + 4.34 + cd $src-pam 4.35 + ./configure --with-pam --prefix=/usr --sysconfdir=/etc \ 4.36 + --libexecdir=/usr/lib/netatalk \ 4.37 + --mandir=/usr/share/man $CONFIGURE_ARGS && 4.38 + make && 4.39 + make DESTDIR=$DESTDIR-pam install 4.40 } 4.41 4.42 # Rules to gen a SliTaz package suitable for Tazpkg. 4.43 genpkg_rules() 4.44 { 4.45 + DEPENDS="perl libdb libcrypto cups gnutls libgcrypt libgpg-error \ 4.46 + libwrap zlib libcomerr3" 4.47 + [ $PACKAGE == netatalk-pam ] && DEPENDS="$DEPENDS pam" && 4.48 + PROVIDE="netatalk:pam" && CAT="system-tools|using PAM" && 4.49 + install=$install-pam 4.50 mkdir -p $fs/usr/share $fs/usr/lib 4.51 cp -a $install/usr/bin $fs/usr 4.52 cp -a $install/usr/sbin $fs/usr 4.53 #cp -a $install/usr/lib/netatalk $fs/usr/lib 4.54 cp -a $install/etc $fs 4.55 cp -a $stuff/etc $fs 4.56 + [ $PACKAGE == netatalk-pam ] || rm -rf $fs/etc/pam.d 4.57 rm -f $fs/etc/netatalk/uams/*a 4.58 } 4.59 4.60 # Pre and post install commands for Tazpkg. 4.61 -post_install() 4.62 +pre_install_netatalk() 4.63 { 4.64 + rm -f "$1/usr/bin/timeout" 4.65 +} 4.66 + 4.67 +post_install_netatalk() 4.68 +{ 4.69 + ln -s /bin/busybox "$1/usr/bin/timeout" 4.70 cat <<EOF 4.71 ---- 4.72 -To start $PACKAGE server you can run : 4.73 +To start netatalk server you can run : 4.74 4.75 - /etc/init.d/$PACKAGE start 4.76 + /etc/init.d/netatalk start 4.77 4.78 -Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf 4.79 +Or add netatalk to RUN_DAEMONS in /etc/rcS.conf 4.80 ---- 4.81 EOF 4.82 } 4.83 + 4.84 +pre_install_netatalk_pam() 4.85 +{ 4.86 + rm -f "$1/usr/bin/timeout" 4.87 +} 4.88 + 4.89 +post_install_netatalk_pam() 4.90 +{ 4.91 + ln -s /bin/busybox "$1/usr/bin/timeout" 4.92 + cat <<EOF 4.93 +---- 4.94 +To start netatalk server you can run : 4.95 + 4.96 + /etc/init.d/netatalk start 4.97 + 4.98 +Or add netatalk to RUN_DAEMONS in /etc/rcS.conf 4.99 +---- 4.100 +EOF 4.101 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/netatalk/stuff/etc/pam.d/netatalk Wed Nov 08 14:51:34 2017 +0100 5.3 @@ -0,0 +1,7 @@ 5.4 +#%PAM-1.0 5.5 +# specify the PAM netatalk behaviour 5.6 + 5.7 +auth required pam_unix.so shadow 5.8 +account required pam_unix.so 5.9 +password required pam_unix.so md5 shadow use_authtok 5.10 +session required pam_unix.so
6.1 --- a/openssh-pam/receipt Wed Nov 08 14:41:47 2017 +0100 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,86 +0,0 @@ 6.4 -# SliTaz package receipt. 6.5 - 6.6 -PACKAGE="openssh-pam" 6.7 -VERSION="7.3p1" 6.8 -CATEGORY="security" 6.9 -SHORT_DESC="Openbsd Secure Shell using PAM." 6.10 -MAINTAINER="pascal.bellard@slitaz.org" 6.11 -LICENSE="BSD" 6.12 -SOURCE="openssh" 6.13 -TARBALL="$SOURCE-$VERSION.tar.gz" 6.14 -WEB_SITE="http://www.openssh.org/" 6.15 -WGET_URL="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL" 6.16 -CONFIG_FILES="/etc/ssh /etc/inetd.conf" 6.17 -TAGS="ssh security" 6.18 - 6.19 -PROVIDE="openssh:pam ssh:pam" 6.20 -DEPENDS="sftp-server libcrypto zlib pam" 6.21 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev" 6.22 -TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE" 6.23 - 6.24 -# Rules to configure and make the package. 6.25 -compile_rules() 6.26 -{ 6.27 - unset LD # for cross compiling with --disable-strip 6.28 - ./configure \ 6.29 - --prefix=/usr \ 6.30 - --sysconfdir=/etc/ssh \ 6.31 - --libexecdir=/usr/sbin \ 6.32 - --with-privsep-user=nobody \ 6.33 - --with-xauth=/usr/bin/xauth \ 6.34 - --with-privsep-path=/var/run/sshd \ 6.35 - --without-ssh1 \ 6.36 - --with-pam \ 6.37 - --disable-strip \ 6.38 - $CONFIGURE_ARGS && 6.39 - make STRIP_OPT="" && 6.40 - make DESTDIR=$DESTDIR install 6.41 -} 6.42 - 6.43 -# Rules to gen a SliTaz package suitable for Tazpkg. 6.44 -genpkg_rules() 6.45 -{ 6.46 - mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh 6.47 - cp -a $install/usr/sbin $install/usr/bin $fs/usr 6.48 - rm -f $fs/usr/sbin/sftp-server 6.49 - cp -a $install/etc $fs 6.50 - cp ../$SOURCE/stuff/openssh $fs/etc/init.d 6.51 - sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config 6.52 - sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \ 6.53 - $fs/etc/ssh/sshd_config 6.54 - 6.55 - cat >> $fs/etc/ssh/ssh_config <<EOT 6.56 - 6.57 -# client bug CVE-2016-0777 and CVE-2016-0778 6.58 -Host * 6.59 - UseRoaming no 6.60 - 6.61 -# From https://wiki.gentoo.org/wiki/SSH_jump_host 6.62 -Host *+* 6.63 - ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') exec nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /') 6.64 - 6.65 -EOT 6.66 -} 6.67 - 6.68 -post_install() 6.69 -{ 6.70 - grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT 6.71 -#ssh stream tcp nowait root sshd sshd -i 6.72 -EOT 6.73 - while read dropbear openssh ; do 6.74 - [ -s "$1$dropbear" ] || continue 6.75 - chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh 6.76 - chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub" 6.77 - chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint 6.78 - done <<EOT 6.79 -/etc/dropbear/dropbear_rsa_host_key /etc/ssh/ssh_host_rsa_key 6.80 -/etc/dropbear/dropbear_dss_host_key /etc/ssh/ssh_host_dsa_key 6.81 -EOT 6.82 - 6.83 - chroot "$1/" ssh-keygen -A 6.84 -} 6.85 - 6.86 -post_remove() 6.87 -{ 6.88 - grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf" 6.89 -}
7.1 --- a/openssh/receipt Wed Nov 08 14:41:47 2017 +0100 7.2 +++ b/openssh/receipt Wed Nov 08 14:51:34 2017 +0100 7.3 @@ -11,8 +11,8 @@ 7.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 7.5 WGET_URL="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL" 7.6 7.7 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev perl mdocml-dev" # groff 7.8 -SPLIT="sftp-server openssh" 7.9 +BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev perl mdocml-dev pam-dev" # groff 7.10 +SPLIT="sftp-server openssh openssh-pam" 7.11 7.12 # Rules to configure and make the package. 7.13 compile_rules() 7.14 @@ -31,23 +31,37 @@ 7.15 -u 50 \ 7.16 sshd && 7.17 7.18 + cp -a $src $src-pam 7.19 ./configure \ 7.20 --sysconfdir=/etc/ssh \ 7.21 --with-md5-passwords \ 7.22 --with-privsep-path=/var/lib/sshd \ 7.23 + --without-pam \ 7.24 + --without-ssh1 \ 7.25 $CONFIGURE_ARGS && 7.26 make && make DESTDIR=$DESTDIR install || return 1 7.27 7.28 - install -vm755 contrib/ssh-copy-id $install/usr/bin 7.29 + cd $src-pam 7.30 + ./configure \ 7.31 + --sysconfdir=/etc/ssh \ 7.32 + --with-privsep-path=/var/lib/sshd \ 7.33 + --with-pam \ 7.34 + --with-xauth=/usr/bin/xauth \ 7.35 + --without-ssh1 \ 7.36 + $CONFIGURE_ARGS && 7.37 + make && make DESTDIR=$DESTDIR-pam install || return 1 7.38 7.39 - cook_pick_manpages contrib/ssh-copy-id.1 7.40 - cook_pick_docs INSTALL LICENCE OVERVIEW README* 7.41 + for inst in $install $install-pam ; do 7.42 + install -vm755 contrib/ssh-copy-id $inst/usr/bin 7.43 7.44 - # SliTaz stuff 7.45 + install=$inst cook_pick_manpages contrib/ssh-copy-id.1 7.46 + install=$inst cook_pick_docs INSTALL LICENCE OVERVIEW README* 7.47 7.48 - mkdir -p $install/etc/init.d 7.49 - cp $stuff/openssh $install/etc/init.d 7.50 - cat >> $install/etc/ssh/ssh_config <<EOT 7.51 + # SliTaz stuff 7.52 + 7.53 + mkdir -p $inst/etc/init.d 7.54 + cp $stuff/openssh $inst/etc/init.d 7.55 + cat >> $inst/etc/ssh/ssh_config <<EOT 7.56 7.57 # client bug CVE-2016-0777 and CVE-2016-0778 7.58 Host * 7.59 @@ -58,6 +72,8 @@ 7.60 ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') exec nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /') 7.61 7.62 EOT 7.63 + done 7.64 + sed -i 's/.*UsePAM.*/UsePAM yes/' $install-pam/etc/ssh/sshd_conifig 7.65 } 7.66 7.67 # Rules to gen a SliTaz package suitable for Tazpkg. 7.68 @@ -79,6 +95,15 @@ 7.69 PROVIDE="ssh" 7.70 TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE" 7.71 ;; 7.72 + openssh-pam) 7.73 + install=$install-pam copy @std sshd/ 7.74 + DEPENDS="sftp-server libcrypto zlib pam" 7.75 + CONFIG_FILES="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config \ 7.76 + /etc/inetd.conf" 7.77 + TAGS="ssh security" 7.78 + PROVIDE="openssh:pam ssh:pam" 7.79 + TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE" 7.80 + ;; 7.81 esac 7.82 } 7.83 7.84 @@ -105,3 +130,27 @@ 7.85 grep -q sshd "$1/etc/inetd.conf" && 7.86 sed -i '/sshd/d' "$1/etc/inetd.conf" 7.87 } 7.88 + 7.89 +post_install_openssh_pam() { 7.90 + grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT 7.91 +#ssh stream tcp nowait root sshd sshd -i 7.92 +EOT 7.93 + 7.94 + while read dropbear openssh; do 7.95 + [ -s "$1$dropbear" ] || continue 7.96 + chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh 7.97 + chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub" 7.98 + chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint 7.99 + done <<EOT 7.100 +/etc/dropbear/dropbear_rsa_host_key /etc/ssh/ssh_host_rsa_key 7.101 +/etc/dropbear/dropbear_dss_host_key /etc/ssh/ssh_host_dsa_key 7.102 +/etc/dropbear/dropbear_ecdsa_host_key /etc/ssh/ssh_host_ecdsa_key 7.103 +EOT 7.104 + 7.105 + chroot "$1/" ssh-keygen -A 7.106 +} 7.107 + 7.108 +post_remove_openssh_pam() { 7.109 + grep -q sshd "$1/etc/inetd.conf" && 7.110 + sed -i '/sshd/d' "$1/etc/inetd.conf" 7.111 +}
8.1 --- a/partimage-pam/receipt Wed Nov 08 14:41:47 2017 +0100 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,71 +0,0 @@ 8.4 -# SliTaz package receipt. 8.5 - 8.6 -PACKAGE="partimage-pam" 8.7 -VERSION="0.6.9" 8.8 -CATEGORY="system-tools" 8.9 -SHORT_DESC="Saves partitions in an image file." 8.10 -MAINTAINER="pascal.bellard@slitaz.org" 8.11 -LICENSE="GPL2" 8.12 -SOURCE="partimage" 8.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 8.14 -WEB_SITE="http://www.partimage.org/Index.fr.html" 8.15 -WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 8.16 -PROVIDE="partimage:pam" 8.17 - 8.18 -DEPENDS="newt bzip2 openssl slitaz-base-files zlib pam gcc-lib-base" 8.19 -BUILD_DEPENDS="newt newt-dev slang-dev bzip2-dev openssl-dev pam pam-dev zlib-dev" 8.20 - 8.21 -# Rules to configure and make the package. 8.22 -compile_rules() 8.23 -{ 8.24 - sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h 8.25 - sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp 8.26 - ./configure \ 8.27 - --prefix=/usr \ 8.28 - --enable-pam \ 8.29 - --sysconfdir=/etc \ 8.30 - --infodir=/usr/share/info \ 8.31 - --mandir=/usr/share/man \ 8.32 - $CONFIGURE_ARGS && 8.33 - make && 8.34 - make DESTDIR=$DESTDIR install 8.35 -} 8.36 - 8.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.38 -genpkg_rules() 8.39 -{ 8.40 - mkdir -p $fs/usr $fs/etc/init.d 8.41 - cp -a $install/usr/sbin $fs/usr 8.42 - cp -a $install/etc $fs/ 8.43 - install -g root -o root -m 0600 ../$SOURCE/stuff/etc/partimaged/partimaged.* $fs/etc/partimaged 8.44 - install -g root -o root -m 0755 ../$SOURCE/stuff/etc/init.d/partimaged $fs/etc/init.d 8.45 -} 8.46 - 8.47 -post_install() 8.48 -{ 8.49 - newline 8.50 - echo "Adding user/group partimag..." 8.51 - chroot "$1/" adduser -S -H -D partimag 8.52 - 8.53 - echo "Setting permissions for config files" 8.54 - chmod 0600 "$1"/etc/partimaged/* 8.55 - chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/* 8.56 - 8.57 - echo "Creating image files directory" 8.58 - chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged" 8.59 - 8.60 - echo "" 8.61 - echo -e "\nTo starts $SOURCE server you can run :\n" 8.62 - echo "/etc/init.d/partimaged start" 8.63 - echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n" 8.64 -} 8.65 - 8.66 -post_remove() 8.67 -{ 8.68 - chroot "$1/" deluser partimag 8.69 - chroot "$1/" delgroup partimag 8.70 - 8.71 - if [ -f "$1/etc/paritimaged" ]; then 8.72 - rm -rf "$1/etc/partimaged" 8.73 - fi 8.74 -}
9.1 --- a/partimage-pam/stuff/partimage-0.6.7_gcc4.u Wed Nov 08 14:41:47 2017 +0100 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,66 +0,0 @@ 9.4 ---- partimage-0.6.7-ori/src/client/main.cpp Sun Feb 3 21:58:00 2008 9.5 -+++ partimage-0.6.7/src/client/main.cpp Thu Sep 24 12:03:23 2009 9.6 -@@ -26,9 +26,11 @@ 9.7 - #include <sys/param.h> 9.8 - #endif 9.9 - 9.10 -+ 9.11 - #include <stdlib.h> 9.12 - #include <stdio.h> 9.13 - #include <unistd.h> 9.14 -+#include <cstdlib> 9.15 - 9.16 - #define __STDC_FORMAT_MACROS 9.17 - #include <inttypes.h> 9.18 ---- partimage-0.6.7-ori/src/client/misc.cpp Sun Feb 3 21:58:00 2008 9.19 -+++ partimage-0.6.7/src/client/misc.cpp Fri Sep 25 15:14:39 2009 9.20 -@@ -24,6 +24,7 @@ 9.21 - #include <unistd.h> 9.22 - #define __STDC_FORMAT_MACROS 9.23 - #include <inttypes.h> 9.24 -+#include <cstring> 9.25 - 9.26 - #ifdef HAVE_SYS_PARAM_H 9.27 - #include <sys/param.h> 9.28 -@@ -2372,7 +2373,7 @@ 9.29 - 9.30 - static char *sfdisk_line_to_partition_device(const char *line) 9.31 - { 9.32 -- if (char *p = strchr(line, ':')) { 9.33 -+ if (const char *p = strchr(line, ':')) { 9.34 - while (p[-1] == ' ' && p > line) p--; 9.35 - return strndup(line, p - line); 9.36 - } else { 9.37 ---- partimage-0.6.7-ori/src/server/partimaged-main.cpp Sun Feb 3 21:57:53 2008 9.38 -+++ partimage-0.6.7/src/server/partimaged-main.cpp Thu Sep 24 10:31:42 2009 9.39 -@@ -27,7 +27,7 @@ 9.40 - 9.41 - #include <stdio.h> 9.42 - #include <stdlib.h> 9.43 --#include <iostream.h> 9.44 -+#include <iostream> 9.45 - #include <sys/types.h> 9.46 - #include <sys/stat.h> 9.47 - #include <signal.h> 9.48 ---- partimage-0.6.7-ori/src/server/partimaged.cpp Sun Feb 3 21:57:53 2008 9.49 -+++ partimage-0.6.7/src/server/partimaged.cpp Thu Sep 24 10:32:08 2009 9.50 -@@ -22,7 +22,7 @@ 9.51 - 9.52 - #include <stdio.h> 9.53 - #include <stdlib.h> 9.54 --#include <iostream.h> 9.55 -+#include <iostream> 9.56 - 9.57 - #include "net.h" 9.58 - #include "netserver.h" 9.59 ---- partimage-0.6.7-ori/src/shared/net.h Sun Feb 3 21:57:55 2008 9.60 -+++ partimage-0.6.7/src/shared/net.h Thu Sep 24 10:32:35 2009 9.61 -@@ -28,7 +28,7 @@ 9.62 - #include <sys/types.h> 9.63 - #include <sys/socket.h> 9.64 - #include <arpa/inet.h> 9.65 --#include <iostream.h> 9.66 -+#include <iostream> 9.67 - #include <pthread.h> 9.68 - 9.69 - #include "pathnames.h"
10.1 --- a/partimage/receipt Wed Nov 08 14:41:47 2017 +0100 10.2 +++ b/partimage/receipt Wed Nov 08 14:51:34 2017 +0100 10.3 @@ -1,43 +1,70 @@ 10.4 -# SliTaz package receipt. 10.5 +# SliTaz package receipt v2. 10.6 10.7 PACKAGE="partimage" 10.8 VERSION="0.6.9" 10.9 CATEGORY="system-tools" 10.10 -SHORT_DESC="Saves partitions in an image file." 10.11 +SHORT_DESC="Saves partitions in an image file" 10.12 MAINTAINER="erjo@slitaz.org" 10.13 LICENSE="GPL2" 10.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 10.15 WEB_SITE="http://www.partimage.org/Index.fr.html" 10.16 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 10.17 10.18 -DEPENDS="newt bzip2 openssl slitaz-base-files zlib gcc-lib-base" 10.19 -BUILD_DEPENDS="newt newt-dev slang-dev bzip2-dev openssl-dev zlib-dev" 10.20 +BUILD_DEPENDS="newt newt-dev slang-dev bzip2-dev openssl-dev zlib-dev pam-dev" 10.21 +SPLIT="partimage partimage-pam" 10.22 10.23 # Rules to configure and make the package. 10.24 compile_rules() 10.25 { 10.26 sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h 10.27 sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp 10.28 + cp -a $src $src-pam 10.29 ./configure \ 10.30 --prefix=/usr \ 10.31 + --disable-pam \ 10.32 --sysconfdir=/etc \ 10.33 --infodir=/usr/share/info \ 10.34 --mandir=/usr/share/man $CONFIGURE_ARGS && 10.35 make && 10.36 make DESTDIR=$DESTDIR install 10.37 + 10.38 + cd $src-pam 10.39 + ./configure \ 10.40 + --prefix=/usr \ 10.41 + --enable-pam \ 10.42 + --sysconfdir=/etc \ 10.43 + --infodir=/usr/share/info \ 10.44 + --mandir=/usr/share/man $CONFIGURE_ARGS && 10.45 + make && 10.46 + make DESTDIR=$DESTDIR-pam install 10.47 } 10.48 10.49 # Rules to gen a SliTaz package suitable for Tazpkg. 10.50 genpkg_rules() 10.51 { 10.52 - mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged 10.53 - cp -a $install/usr/sbin $fs/usr 10.54 - cp -a $install/etc $fs/ 10.55 - install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged 10.56 - install -g root -o root -m 0755 stuff/etc/init.d/partimaged $fs/etc/init.d 10.57 + case $PACKAGE in 10.58 + partimage) 10.59 + DEPENDS="newt bzip2 openssl slitaz-base-files zlib gcc-lib-base" 10.60 + mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged 10.61 + cp -a $install/usr/sbin $fs/usr 10.62 + cp -a $install/etc $fs/ 10.63 + install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged 10.64 + install -g root -o root -m 0755 stuff/etc/init.d/partimaged $fs/etc/init.d 10.65 + ;; 10.66 + partimage-pam) 10.67 + CAT="system-tools|using PAM" 10.68 + PROVIDE="partimage:pam" 10.69 + DEPENDS="newt bzip2 openssl slitaz-base-files zlib pam gcc-lib-base" 10.70 + mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged 10.71 + cp -a $install-pam/usr/sbin $fs/usr 10.72 + cp -a $install-pam/etc $fs/ 10.73 + install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged 10.74 + install -g root -o root -m 0755 stuff/etc/init.d/partimaged $fs/etc/init.d 10.75 + ;; 10.76 + esac 10.77 } 10.78 10.79 -post_install() 10.80 +post_install_partimage() 10.81 { 10.82 echo 10.83 echo "Adding user/group partimag..." 10.84 @@ -51,12 +78,12 @@ 10.85 chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged" 10.86 10.87 echo "" 10.88 - echo -e "\nTo starts $PACKAGE server you can run :\n" 10.89 + echo -e "\nTo starts partimage server you can run :\n" 10.90 echo "/etc/init.d/partimaged start" 10.91 echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n" 10.92 } 10.93 10.94 -post_remove() 10.95 +post_remove_partimage() 10.96 { 10.97 chroot "$1/" deluser partimag 10.98 chroot "$1/" delgroup partimag 10.99 @@ -65,3 +92,32 @@ 10.100 rm -rf "$1/etc/partimaged" 10.101 fi 10.102 } 10.103 + 10.104 +post_install_partimage_pam() 10.105 +{ 10.106 + echo 10.107 + echo "Adding user/group partimag..." 10.108 + chroot "$1/" adduser -S -H -D partimag 10.109 + 10.110 + echo "Setting permissions for config files" 10.111 + chmod 0600 "$1"/etc/partimaged/* 10.112 + chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/* 10.113 + 10.114 + echo "Creating image files directory" 10.115 + chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged" 10.116 + 10.117 + echo "" 10.118 + echo -e "\nTo starts partimage server you can run :\n" 10.119 + echo "/etc/init.d/partimaged start" 10.120 + echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n" 10.121 +} 10.122 + 10.123 +post_remove_partimage_pam() 10.124 +{ 10.125 + chroot "$1/" deluser partimag 10.126 + chroot "$1/" delgroup partimag 10.127 + 10.128 + if [ -f "$1/etc/paritimaged" ]; then 10.129 + rm -rf "$1/etc/partimaged" 10.130 + fi 10.131 +}