wok-next rev 20288

remove slim-pam sudo-pam
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Nov 08 17:03:48 2017 +0100 (2017-11-08)
parents 3d64683c6590
children c2c1188bec51
files screen/receipt slim-pam/receipt slim/receipt sudo-pam/description.txt sudo-pam/receipt sudo-pam/stuff/sudo sudo/receipt sudo/stuff/sudo
line diff
     1.1 --- a/screen/receipt	Wed Nov 08 16:26:01 2017 +0100
     1.2 +++ b/screen/receipt	Wed Nov 08 17:03:48 2017 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4  		mkdir -p $dir/usr/share/terminfo &&
     1.5  		tic -o $dir/usr/share/terminfo terminfo/screeninfo.src &&
     1.6  		mkdir -p $dir/etc &&
     1.7 -		cp -a $src/etc/screenrc $dir/etc
     1.8 +		cp $src/etc/screenrc $dir/etc
     1.9  	done
    1.10  }
    1.11  
     2.1 --- a/slim-pam/receipt	Wed Nov 08 16:26:01 2017 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,70 +0,0 @@
     2.4 -# SliTaz package receipt.
     2.5 -
     2.6 -PACKAGE="slim-pam"
     2.7 -VERSION="1.3.5"
     2.8 -CATEGORY="x-window"
     2.9 -SHORT_DESC="Desktop-independent graphical login manager for X11 (PAM enabled)."
    2.10 -MAINTAINER="pascal.bellard@slitaz.org"
    2.11 -LICENSE="GPL2"
    2.12 -WEB_SITE="http://slim.berlios.de/"
    2.13 -SOURCE="slim"
    2.14 -TARBALL="$SOURCE-$VERSION.tar.gz"
    2.15 -WGET_URL="http://download.berlios.de/slim/$TARBALL"
    2.16 -CONFIG_FILES="/etc/slim.conf"
    2.17 -
    2.18 -PROVIDE="slim:pam"
    2.19 -DEPENDS="gcc-lib-base libjpeg libpng pam xorg-libXft xorg-libXmu"
    2.20 -SUGGESTED="slim-theme-default slitaz-configs"
    2.21 -BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \
    2.22 -xorg-libXmu-dev pam-dev"
    2.23 -RELATED="slim slim-theme-default"
    2.24 -
    2.25 -# Rules to configure and make the package.
    2.26 -compile_rules()
    2.27 -{
    2.28 -	patch -p1 < $WOK/$SOURCE/stuff/patches/$SOURCE-$VERSION.patch || return 1
    2.29 -	mkdir build; cd build
    2.30 -	cmake \
    2.31 -		-DCMAKE_INSTALL_PREFIX=/usr \
    2.32 -		-DX11_Xmu_LIB=-lXmu \
    2.33 -		-DUSE_PAM=yes \
    2.34 -		.. &&
    2.35 -	make &&
    2.36 -	make DESTDIR=$DESTDIR install
    2.37 -}
    2.38 -
    2.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.40 -genpkg_rules()
    2.41 -{
    2.42 -	mkdir -p $fs/usr/share/slim
    2.43 -	cp -a $install/etc $fs
    2.44 -	cp -a $install/usr/bin $fs/usr
    2.45 -	cp -a $WOK/$SOURCE/stuff/themes $fs/usr/share/slim
    2.46 -
    2.47 -	# Config file and rc script.
    2.48 -	cp -a $WOK/$SOURCE/stuff/etc $fs
    2.49 -	chown -R root.root $fs
    2.50 -
    2.51 -	# slim-theme manager
    2.52 -	install -m755 $WOK/$SOURCE/stuff/slim-theme $fs/usr/bin/slim-theme
    2.53 -}
    2.54 -
    2.55 -post_install()
    2.56 -{
    2.57 -	local USER
    2.58 -	USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd")
    2.59 -	[ -n "$USER" ] &&
    2.60 -	sed -i s/"default_user .*"/"default_user        $USER"/ "$1/etc/slim.conf"
    2.61 -
    2.62 -	# In order to update the SLiM, we need to restart it.
    2.63 -	# We can't just "/etc/init.d/slim restart" because it momentarily interrupts
    2.64 -	# X session and the user will get a terrible console with strange letters.
    2.65 -	printf '%40s\n' | tr ' ' '='
    2.66 -	echo "In order to update the SLiM,"
    2.67 -	echo "please, reboot your system!"
    2.68 -}
    2.69 -
    2.70 -pre_remove()
    2.71 -{
    2.72 -	tazpkg get-install  ${PACKAGE%-pam}
    2.73 -}
     3.1 --- a/slim/receipt	Wed Nov 08 16:26:01 2017 +0100
     3.2 +++ b/slim/receipt	Wed Nov 08 17:03:48 2017 +0100
     3.3 @@ -17,8 +17,7 @@
     3.4  xorg-libXmu-dev"
     3.5  BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
     3.6  libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev"
     3.7 -SPLIT="slim-theme-default slim"
     3.8 -SIBLINGS="slim-pam"
     3.9 +SPLIT="slim-theme-default slim slim-pam"
    3.10  
    3.11  # Rules to configure and make the package.
    3.12  compile_rules()
    3.13 @@ -34,25 +33,40 @@
    3.14  	esac
    3.15  
    3.16  	mkdir build; cd build
    3.17 +	cp -a $src $src-pam
    3.18  	cmake \
    3.19  		-DCMAKE_INSTALL_PREFIX=/usr \
    3.20  		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
    3.21  		-DX11_Xft_INCLUDE_PATH=$INCL \
    3.22  		-DX11_Xmu_INCLUDE_PATH=$INCL \
    3.23 +		-DUSE_PAM=no \
    3.24  		.. &&
    3.25  	make &&
    3.26  	make DESTDIR=$DESTDIR install || exit 1
    3.27  
    3.28 -	cp -r $stuff/themes $install/usr/share/slim
    3.29 +	cd $src-pam/build
    3.30 +	cmake \
    3.31 +		-DCMAKE_INSTALL_PREFIX=/usr \
    3.32 +		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
    3.33 +		-DX11_Xft_INCLUDE_PATH=$INCL \
    3.34 +		-DX11_Xmu_INCLUDE_PATH=$INCL \
    3.35 +		-DUSE_PAM=yes \
    3.36 +		.. &&
    3.37 +	make &&
    3.38 +	make DESTDIR=$DESTDIR-pam install || exit 1
    3.39  
    3.40 -	# Config file and rc script.
    3.41 -	cp -a $stuff/etc $install
    3.42 +	for inst in $install $install-pam ; do
    3.43 +		cp -r $stuff/themes $inst/usr/share/slim
    3.44  
    3.45 -	# slim-theme manager & default strings
    3.46 -	install -m755 $stuff/slim-theme $install/usr/bin/slim-theme
    3.47 -	install -m644 $stuff/strings    $install/usr/share/slim/strings
    3.48 +		# Config file and rc script.
    3.49 +		cp -a $stuff/etc $inst
    3.50  
    3.51 -	chown -R root:root $install
    3.52 +		# slim-theme manager & default strings
    3.53 +		install -m755 $stuff/slim-theme $inst/usr/bin/slim-theme
    3.54 +		install -m644 $stuff/strings    $inst/usr/share/slim/strings
    3.55 +
    3.56 +		chown -R root:root $inst
    3.57 +	done
    3.58  }
    3.59  
    3.60  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.61 @@ -71,6 +85,16 @@
    3.62  			CONFIG_FILES="/etc/slim.conf"
    3.63  			SUGGESTED="slim-theme-default slitaz-configs"
    3.64  			;;
    3.65 +		slim-pam)
    3.66 +			install=$install-pam copy @std
    3.67 +			rm -rf $fs/usr/share/slim/themes/default
    3.68 +			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
    3.69 +			xorg-libXft xorg-libXmu xorg-libXrender zlib pam"
    3.70 +			CONFIG_FILES="/etc/slim.conf"
    3.71 +			SUGGESTED="slim-theme-default slitaz-configs"
    3.72 +			PROVIDE="slim:pam"
    3.73 +			CAT="x-window|(PAM enabled)"
    3.74 +			;;
    3.75  	esac
    3.76  }
    3.77  
    3.78 @@ -81,6 +105,13 @@
    3.79  	sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf"
    3.80  }
    3.81  
    3.82 +post_install_slim_pam() {
    3.83 +	local USER=$(awk -F: '/:1000:1000:/ { print $1 }' "$1/etc/passwd")
    3.84 +	[ -n "$USER" ] &&
    3.85 +	sed -i s/"default_user .*"/"default_user        $USER"/ "$1/etc/slim.conf"
    3.86 +	sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf"
    3.87 +}
    3.88 +
    3.89  post_install_slim_theme_default() {
    3.90  	chroot "$1/" slim-theme -sdefault
    3.91  }
     4.1 --- a/sudo-pam/description.txt	Wed Nov 08 16:26:01 2017 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,4 +0,0 @@
     4.4 -Sudo (su "do") allows a system administrator to delegate authority to give 
     4.5 -certain users (or groups of users) the ability to run some (or all) commands as 
     4.6 -root or another user while providing an audit trail of the commands and their 
     4.7 -arguments.
     5.1 --- a/sudo-pam/receipt	Wed Nov 08 16:26:01 2017 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,61 +0,0 @@
     5.4 -# SliTaz package receipt v2.
     5.5 -
     5.6 -PACKAGE="sudo-pam"
     5.7 -VERSION="1.8.20p2"
     5.8 -CATEGORY="security"
     5.9 -SHORT_DESC="Execute a command as another user, with PAM support"
    5.10 -MAINTAINER="erjo@slitaz.org"
    5.11 -LICENSE="ISC"
    5.12 -WEB_SITE="https://www.sudo.ws/"
    5.13 -
    5.14 -TARBALL="sudo-$VERSION.tar.gz"
    5.15 -WGET_URL="${WEB_SITE}dist/$TARBALL"
    5.16 -
    5.17 -BUILD_DEPENDS="gettext groff pam-dev"
    5.18 -SPLIT="sudo-pam-dev"
    5.19 -
    5.20 -# Rules to configure and make the package.
    5.21 -compile_rules()
    5.22 -{
    5.23 -	./configure \
    5.24 -		--sysconfdir=/etc \
    5.25 -		--libexecdir=/usr/lib \
    5.26 -		--with-secure-path \
    5.27 -		--with-all-insults \
    5.28 -		--with-env-editor \
    5.29 -		--docdir=/usr/share/doc/sudo-$VERSION \
    5.30 -		--with-passprompt="[sudo] password for %p" \
    5.31 -		--with-pam \
    5.32 -		$CONFIGURE_ARGS &&
    5.33 -	make &&
    5.34 -	make install &&
    5.35 -
    5.36 -	ln -sfv libsudo_util.so.0.0.0 $install/usr/lib/sudo/libsudo_util.so.0 &&
    5.37 -
    5.38 -	mkdir -p $install/etc/pam.d &&
    5.39 -	cp $stuff/sudo $install/etc/pam.d/
    5.40 -}
    5.41 -
    5.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.43 -genpkg_rules()
    5.44 -{
    5.45 -	case $PACKAGE in
    5.46 -		sudo-pam)
    5.47 -			copy @std
    5.48 -			DEPENDS="pam zlib"
    5.49 -			PROVIDE="sudo:pam"
    5.50 -			CONFIG_FILES="/etc/sudoers /etc/pam.d/sudo"
    5.51 -			;;
    5.52 -		*-dev)
    5.53 -			copy @dev
    5.54 -			DEPENDS="pam-dev zlib-dev"
    5.55 -			PROVIDE="sudo-dev:pam"
    5.56 -			;;
    5.57 -	esac
    5.58 -}
    5.59 -
    5.60 -# FIXME: you will not be able to remove 'sudo-pam' until you remove 'pam'...
    5.61 -pre_remove_sudo_pam()
    5.62 -{
    5.63 -	tazpkg -gi sudo
    5.64 -}
     6.1 --- a/sudo-pam/stuff/sudo	Wed Nov 08 16:26:01 2017 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,7 +0,0 @@
     6.4 -#%PAM-1.0
     6.5 -# specify the PAM fallback behaviour
     6.6 -
     6.7 -auth	required	pam_unix.so
     6.8 -account	required	pam_unix.so
     6.9 -password	required	pam_unix.so md5
    6.10 -session	required	pam_limits.so
     7.1 --- a/sudo/receipt	Wed Nov 08 16:26:01 2017 +0100
     7.2 +++ b/sudo/receipt	Wed Nov 08 17:03:48 2017 +0100
     7.3 @@ -11,12 +11,13 @@
     7.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     7.5  WGET_URL="${WEB_SITE}dist/$TARBALL"
     7.6  
     7.7 -BUILD_DEPENDS="gettext groff"
     7.8 -SPLIT="sudo-dev"
     7.9 +BUILD_DEPENDS="gettext groff pam-dev"
    7.10 +SPLIT="sudo sudo-pam sudo-dev sudo-pam-dev"
    7.11  
    7.12  # Rules to configure and make the package.
    7.13  compile_rules()
    7.14  {
    7.15 +	cp -a $src $src-pam
    7.16  	./configure \
    7.17  		--sysconfdir=/etc \
    7.18  		--libexecdir=/usr/lib \
    7.19 @@ -30,7 +31,25 @@
    7.20  	make &&
    7.21  	make install &&
    7.22  
    7.23 -	ln -sfv libsudo_util.so.0.0.0 $install/usr/lib/sudo/libsudo_util.so.0
    7.24 +	cd $src-pam &&
    7.25 +	./configure \
    7.26 +		--sysconfdir=/etc \
    7.27 +		--libexecdir=/usr/lib \
    7.28 +		--with-secure-path \
    7.29 +		--with-all-insults \
    7.30 +		--with-env-editor \
    7.31 +		--docdir=/usr/share/doc/sudo-$VERSION \
    7.32 +		--with-passprompt="[sudo] password for %p" \
    7.33 +		--with-pam \
    7.34 +		$CONFIGURE_ARGS &&
    7.35 +	make &&
    7.36 +	make DESTDIR=$DESTDIR-pam install &&
    7.37 +
    7.38 +	ln -sfv libsudo_util.so.0.0.0 $install/usr/lib/sudo/libsudo_util.so.0 &&
    7.39 +	ln -sfv libsudo_util.so.0.0.0 $install-pam/usr/lib/sudo/libsudo_util.so.0 &&
    7.40 +	
    7.41 +	mkdir -p $install-pam/etc/pam.d &&
    7.42 +	cp $stuff/sudo $install-pam/etc/pam.d/
    7.43  }
    7.44  
    7.45  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.46 @@ -42,9 +61,20 @@
    7.47  			DEPENDS="zlib"
    7.48  			CONFIG_FILES="/etc/sudoers"
    7.49  			;;
    7.50 -		*-dev)
    7.51 +		sudo-pam)
    7.52 +			install=$install-pam copy @std
    7.53 +			DEPENDS="zlib pam"
    7.54 +			PROVIDE="sudo:pam"
    7.55 +			CONFIG_FILES="/etc/sudoers /etc/pam.d/sudo"
    7.56 +			;;
    7.57 +		sudo-dev)
    7.58  			copy @dev
    7.59  			DEPENDS="zlib-dev"
    7.60  			;;
    7.61 +		sudo-pam-dev)
    7.62 +			install=$install-pam copy @dev
    7.63 +			DEPENDS="zlib-dev pam-dev"
    7.64 +			PROVIDE="sudo-dev:pam"
    7.65 +			;;
    7.66  	esac
    7.67  }
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/sudo/stuff/sudo	Wed Nov 08 17:03:48 2017 +0100
     8.3 @@ -0,0 +1,7 @@
     8.4 +#%PAM-1.0
     8.5 +# specify the PAM fallback behaviour
     8.6 +
     8.7 +auth	required	pam_unix.so
     8.8 +account	required	pam_unix.so
     8.9 +password	required	pam_unix.so md5
    8.10 +session	required	pam_limits.so