# HG changeset patch # User Aleksej Bobylev # Date 1510162797 -7200 # Node ID d3adbeea3a9f98c108eeaec03d8c9f95756ae7ba # Parent 4c0950b913fd3a3e68739110bf28fcac3c7f2f40 Up warzone2100; add pulse; tiny edits for fresh *-pam changes diff -r 4c0950b913fd -r d3adbeea3a9f cups/receipt --- a/cups/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/cups/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -20,14 +20,14 @@ { # gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group), # using 23 instead - addgroup -g 23 lpadmin && + addgroup -g 23 lpadmin - sed -i 's:555:755:g;s:444:644:g' Makedefs.in && - sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 && - sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 && + sed -i 's:555:755:g;s:444:644:g' Makedefs.in + sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 + sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 - aclocal -I config-scripts && - autoconf -I config-scripts && + aclocal -I config-scripts + autoconf -I config-scripts cp -a $src $src-pam @@ -43,9 +43,9 @@ --with-docdir=/usr/share/doc/cups-$VERSION \ $CONFIGURE_ARGS && make && - make BUILDROOT=$install install && + make BUILDROOT=$install install || return 1 - cd $src-pam && + cd $src-pam CC=gcc \ ./configure \ --sysconfdir=/etc \ @@ -58,7 +58,7 @@ --with-docdir=/usr/share/doc/cups-$VERSION \ $CONFIGURE_ARGS && make && - make BUILDROOT=$install-pam install && + make BUILDROOT=$install-pam install || return 1 for inst in $install $install-pam ; do rm -rf $inst/tmp && @@ -109,16 +109,16 @@ DEPENDS="libgnutls zlib" ;; cups) - copy @std var/ # copy empty dirs in var/ - remove_already_packed + copy @std @rm DEPENDS="acl dbus libcups libgnutls libusb zlib" CONFIG_FILES="/etc/cups/" TAGS="printer printing" ;; cups-pam) install=$install-pam \ - copy @std var/ # copy empty dirs in var/ + copy @std rm -f $fs/usr/lib/libcups.so* + CAT="system-tools|with PAM support" DEPENDS="acl dbus libcups libgnutls libusb zlib pam" PROVIDE="cups:pam" CONFIG_FILES="/etc/cups/" diff -r 4c0950b913fd -r d3adbeea3a9f cyrus-sasl/receipt --- a/cyrus-sasl/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/cyrus-sasl/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -18,7 +18,7 @@ # Rules to configure and make the package. compile_rules() { - autoreconf -fi && + autoreconf -fi || return 1 mkdir -p $src/saslauthd/cmulocal cp -a $src $src-pam @@ -34,7 +34,7 @@ --with-ldap \ --with-openssl \ $CONFIGURE_ARGS && - make && make install && + make && make install || return 1 cd $src-pam ./configure \ @@ -47,7 +47,7 @@ --with-ldap \ --with-openssl \ $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR-pam install && + make && make DESTDIR=$DESTDIR-pam install || return 1 for inst in $install $install-pam; do docdir="$inst/usr/share/doc/cyrus-sasl-$VERSION" diff -r 4c0950b913fd -r d3adbeea3a9f enlightenment/receipt --- a/enlightenment/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/enlightenment/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -35,7 +35,7 @@ --disable-doc \ --build=${ARCH}-slitaz-gnulinux \ $CONFIGURE_ARGS && - make $MAKEFLAGS && make install + make $MAKEFLAGS && make install || return 1 cd $src-pam ./configure \ @@ -54,11 +54,13 @@ enlightenment|enlightenment-pam) DEPENDS="eet evas ecore eeze emotion efreet edbus edje \ elementary alsa-lib xcb-util-keysyms" - [ $PACKAGE == enlightenment-pam ] && - DEPENDS="$DEPENDS pam" && install=$install-pam && - CAT="x-window|with PAM, Bluez and connman support" && - SUGGESTED="bluez wpa_supplicant connman pm-utils" && + if [ $PACKAGE == 'enlightenment-pam' ]; then + DEPENDS="$DEPENDS pam" + install=$install-pam + CAT="x-window|with PAM, Bluez and connman support" + SUGGESTED="bluez wpa_supplicant connman pm-utils" PROVIDE="enlightenment:pam" + fi mkdir -p $fs/usr/share/locale # Use a modified sysactions.conf cp -a $stuff/etc $fs @@ -82,7 +84,6 @@ ;; enlightenment-backgrounds) CAT="x-window|additional backgrounds" - DEPENDS="" mkdir -p $fs/usr/share/enlightenment/data/backgrounds cp -a $install/usr/share/enlightenment/data/backgrounds/* \ $fs/usr/share/enlightenment/data/backgrounds diff -r 4c0950b913fd -r d3adbeea3a9f libcap/receipt --- a/libcap/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/libcap/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -27,7 +27,7 @@ sed -i '/install.*STALIBNAME/d' libcap/Makefile make $ARCH_ARGS && - make RAISE_SETFCAP=no prefix=/usr install + make RAISE_SETFCAP=no prefix=/usr install || return 1 chmod 755 $install/usr/lib/libcap.so mkdir $install/lib @@ -45,7 +45,7 @@ DEPENDS="attr" ;; libcap-pam) - CAT="system-tools|pam module" + CAT="system-tools|PAM module" PROVIDE="libcap:pam" DEPENDS="libcap pam" copy pam_cap.so diff -r 4c0950b913fd -r d3adbeea3a9f netatalk/receipt --- a/netatalk/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/netatalk/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -22,7 +22,7 @@ --libexecdir=/usr/lib/netatalk \ --mandir=/usr/share/man $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR install + make DESTDIR=$DESTDIR install || return 1 cd $src-pam ./configure --with-pam --prefix=/usr --sysconfdir=/etc \ @@ -37,16 +37,19 @@ { DEPENDS="perl libdb libcrypto cups gnutls libgcrypt libgpg-error \ libwrap zlib libcomerr3" - [ $PACKAGE == netatalk-pam ] && DEPENDS="$DEPENDS pam" && - PROVIDE="netatalk:pam" && CAT="system-tools|using PAM" && + if [ $PACKAGE == 'netatalk-pam' ]; then + DEPENDS="$DEPENDS pam" + PROVIDE="netatalk:pam" + CAT="system-tools|using PAM" install=$install-pam + fi mkdir -p $fs/usr/share $fs/usr/lib cp -a $install/usr/bin $fs/usr cp -a $install/usr/sbin $fs/usr #cp -a $install/usr/lib/netatalk $fs/usr/lib cp -a $install/etc $fs cp -a $stuff/etc $fs - [ $PACKAGE == netatalk-pam ] || rm -rf $fs/etc/pam.d + [ $PACKAGE == 'netatalk-pam' ] || rm -rf $fs/etc/pam.d rm -f $fs/etc/netatalk/uams/*a } diff -r 4c0950b913fd -r d3adbeea3a9f openssh/receipt --- a/openssh/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/openssh/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -97,6 +97,7 @@ openssh-pam) install=$install-pam copy @std sshd/ sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config + CAT="security|with PAM support" DEPENDS="sftp-server libcrypto zlib pam" CONFIG_FILES="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config \ /etc/inetd.conf" diff -r 4c0950b913fd -r d3adbeea3a9f partimage/receipt --- a/partimage/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/partimage/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -18,7 +18,9 @@ { sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp + cp -a $src $src-pam + ./configure \ --prefix=/usr \ --disable-pam \ @@ -26,7 +28,7 @@ --infodir=/usr/share/info \ --mandir=/usr/share/man $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR install + make DESTDIR=$DESTDIR install || return 1 cd $src-pam ./configure \ diff -r 4c0950b913fd -r d3adbeea3a9f perdition/receipt --- a/perdition/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/perdition/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -27,7 +27,7 @@ --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR install + make DESTDIR=$DESTDIR install || return 1 cd $src-pam ./configure --prefix=/usr --infodir=/usr/share/info \ @@ -47,8 +47,12 @@ perdition|perdition-pam) DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap \ openssl cyrus-sasl glibc-base libkrb5 libcomerr3 gdbm" - [ $PACKAGE == perdition-pam ] && DEPENDS="$DEPENDS pam" && - PROVIDE="perdition:pam" && install=$install-pam + if [ $PACKAGE == 'perdition-pam' ]; then + CAT="network|with PAM support" + DEPENDS="$DEPENDS pam" + PROVIDE="perdition:pam" + install=$install-pam + fi mkdir -p $fs/usr/lib $fs/etc/openldap/schema cp -a $install/etc $fs rm -f $fs/etc/perdition/perdition.conf @@ -61,7 +65,6 @@ cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema ;; perdition-dev) - CAT="development|development files" DEPENDS="perdition" mkdir -p $fs/usr/lib cp -a $install/usr/lib/*.a $fs/usr/lib diff -r 4c0950b913fd -r d3adbeea3a9f polkit/receipt --- a/polkit/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/polkit/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -19,9 +19,9 @@ # Rules to configure and make the package. compile_rules() { - addgroup -g 27 polkitd && + addgroup -g 27 polkitd adduser -g "PolicyKit Daemon Owner" -h /etc/polkit-1 -u 27 \ - -G polkitd -s /bin/false -D polkitd && + -G polkitd -s /bin/false -D polkitd cp -a $src $src-pam ./configure \ @@ -30,19 +30,19 @@ --enable-libsystemd-login=no \ --with-authfw=shadow \ $CONFIGURE_ARGS && - make && make install && + make && make install || return 1 - cd $src-pam && + cd $src-pam ./configure \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-libsystemd-login=no \ --with-authfw=pam \ $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR-pam install && + make && make DESTDIR=$DESTDIR-pam install || return 1 - mkdir -p $install-pam/etc/pam.d && - cp $stuff/polkit-1 $install-pam/etc/pam.d && + mkdir -p $install-pam/etc/pam.d + cp $stuff/polkit-1 $install-pam/etc/pam.d for inst in $install $install-pam ; do # for access file in web interface, will be changed back in post-install to 700 chmod 755 "$inst/etc/polkit-1/rules.d/" @@ -61,6 +61,7 @@ ;; polkit-pam) install=$install-pam copy @std + CAT="base-system|using PAM" DEPENDS="expat glib js pam" PROVIDE="polkit:pam" ;; @@ -70,6 +71,7 @@ ;; polkit-pam-dev) install=$install-pam copy @dev + CAT="development|development files, using PAM" DEPENDS="polkit expat-dev glib-dev js-dev pam-dev" PROVIDE="polkit-dev:pam" ;; diff -r 4c0950b913fd -r d3adbeea3a9f ppp/receipt --- a/ppp/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/ppp/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -27,7 +27,7 @@ cp -a $src $src-pam ./configure $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR/usr install + make DESTDIR=$DESTDIR/usr install || return 1 cd $src-pam sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux @@ -41,8 +41,12 @@ { case $PACKAGE in ppp|ppp-pam) - [ $PACKAGE == ppp-pam ] && DEPENDS="pam" && PROVIDE="ppp:pam" && - CAT="network|with PAM support" && install=$install-pam + if [ $PACKAGE == 'ppp-pam' ]; then + DEPENDS="pam" + PROVIDE="ppp:pam" + CAT="network|with PAM support" + install=$install-pam + fi mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN cp -a $install/usr/sbin $fs/usr [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr @@ -111,7 +115,6 @@ chmod 711 $fs/etc/ppp/scripts/* ;; ppp-dev) - CAT="development|development files" copy include/ ;; esac diff -r 4c0950b913fd -r d3adbeea3a9f pulse/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pulse/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt v2. + +PACKAGE="pulse" +VERSION="0.0.32" # releases are absent, there's 32th commit +COMMIT="77456be" +CATEGORY="system-tools" +SHORT_DESC="CPU monitor that can disable processors on the fly" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="GPL3" +WEB_SITE="https://github.com/DoMiNeLa10/pulse" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/DoMiNeLa10/pulse/archive/$COMMIT.tar.gz" + +BUILD_DEPENDS="gtk+-dev" + +compile_rules() { + make || return 1 + + mkdir -p $install/usr/bin + cp -a pulse $install/usr/bin +} + +genpkg_rules() { + copy @std + DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango" +} diff -r 4c0950b913fd -r d3adbeea3a9f pulse/stuff/pulse.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pulse/stuff/pulse.desktop Wed Nov 08 19:39:57 2017 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Pulse +Comment=A CPU monitor that can disable processors on the fly +Exec=pulse +Icon=pulse +Categories=System;Monitor; diff -r 4c0950b913fd -r d3adbeea3a9f pulse/stuff/pulse.png Binary file pulse/stuff/pulse.png has changed diff -r 4c0950b913fd -r d3adbeea3a9f pure-ftpd/receipt --- a/pure-ftpd/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/pure-ftpd/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -24,13 +24,13 @@ --with-puredb \ --with-extauth \ $CONFIGURE_ARGS && - make && make install + make && make install || return 1 cd $src-pam ./configure \ --with-pam \ $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR-pam install + make && make DESTDIR=$DESTDIR-pam install || return 1 # daemon mkdir -p $install/etc/init.d $install-pam/etc/init.d diff -r 4c0950b913fd -r d3adbeea3a9f screen/receipt --- a/screen/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/screen/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -17,19 +17,26 @@ compile_rules() { cp -a $src $src-pam - ./configure --with-sys-screenrc=/etc/screenrc \ - --disable-pam $CONFIGURE_ARGS && + + ./configure \ + --with-sys-screenrc=/etc/screenrc \ + --disable-pam \ + $CONFIGURE_ARGS && make && - make -j1 DESTDIR=$DESTDIR install && - cd $src-pam && - ./configure --with-sys-screenrc=/etc/screenrc \ - --enable-pam $CONFIGURE_ARGS && + make -j1 DESTDIR=$DESTDIR install || return 1 + + cd $src-pam + ./configure \ + --with-sys-screenrc=/etc/screenrc \ + --enable-pam \ + $CONFIGURE_ARGS && make && - make -j1 DESTDIR=$DESTDIR-pam install && + make -j1 DESTDIR=$DESTDIR-pam install || return 1 + for dir in $DESTDIR $DESTDIR-pam ; do - mkdir -p $dir/usr/share/terminfo && - tic -o $dir/usr/share/terminfo terminfo/screeninfo.src && - mkdir -p $dir/etc && + mkdir -p $dir/usr/share/terminfo + tic -o $dir/usr/share/terminfo terminfo/screeninfo.src + mkdir -p $dir/etc cp $src/etc/screenrc $dir/etc done } @@ -42,9 +49,12 @@ CONFIG_FILES="/etc/screenrc" SUGGESTED="screen-terminfo" DEPENDS="elfutils" - [ $PACKAGE == screen-pam] && DEPENDS="$DEPENDS pam" && - CAT="system-tools|with PAM support" && - PROVIDE="screen:pam" && install=$install-pam + if [ $PACKAGE == 'screen-pam' ]; then + DEPENDS="$DEPENDS pam" + CAT="system-tools|with PAM support" + PROVIDE="screen:pam" + install=$install-pam + fi mkdir -p $fs/usr/bin $fs/usr/share cp -a $install/etc $fs cp -a $install/usr/bin/screen-$VERSION $fs/usr/bin/screen diff -r 4c0950b913fd -r d3adbeea3a9f slim/receipt --- a/slim/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/slim/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -94,7 +94,7 @@ CONFIG_FILES="/etc/slim.conf" SUGGESTED="slim-theme-default slitaz-configs" PROVIDE="slim:pam" - CAT="x-window|(PAM enabled)" + CAT="x-window|PAM enabled" ;; esac } diff -r 4c0950b913fd -r d3adbeea3a9f warzone2100/receipt --- a/warzone2100/receipt Wed Nov 08 18:13:10 2017 +0100 +++ b/warzone2100/receipt Wed Nov 08 19:39:57 2017 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="warzone2100" VERSION="3.2.3" @@ -6,34 +6,34 @@ SHORT_DESC="3D realtime strategy game on a future Earth" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" +WEB_SITE="http://wz2100.net/" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://wz2100.net/" WGET_URL="$SF_MIRROR/warzone2100/releases/$VERSION/$TARBALL" -DEPENDS="libsdl-net mesa openal jpeg libpng libvorbis libtheora libmad physfs \ -quesoglc popt ttf-dejavu ttf-dejavu-extra" -BUILD_DEPENDS="automake perl zip gettext qt5-dev xorg-libX11-dev libsdl2-dev \ -libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev mesa17-dev \ -libcrypto-dev physfs-dev xorg-libXrandr-dev fribidi-dev freetype-dev \ -fontconfig-dev openssl-dev git" +BUILD_DEPENDS="automake perl zip unzip gettext qt5-dev xorg-libX11-dev \ +libsdl2-dev libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev \ +mesa17-dev libcrypto-dev physfs-dev xorg-libXrandr-dev fribidi-dev \ +freetype-dev fontconfig-dev openssl-dev git" -# Rules to configure and make the package. -compile_rules() -{ - autogen.sh && +compile_rules() { + # small improvements + sed -i 's| = |=|' icons/warzone2100.desktop + rm po/pt_BR.gmo; sed -i 's|\\v||' po/pt_BR.po; msgfmt po/pt_BR.po -o po/pt_BR.gmo + + ./autogen.sh && ./configure \ --with-distributor="SliTaz" \ + --with-appdatadir=/usr/share/appdata \ $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR install + make -C src autorevision.h && + make && + make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - copy @std -# mkdir -p $fs/usr/share/pixmaps -# cp -a $install/usr/bin $fs/usr -# cp -a $install/usr/share/applications $fs/usr/share -# cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps -# cp -a $install/usr/share/warzone2100 $fs/usr/share +genpkg_rules() { + copy @std hicolor/ *.mo + DEPENDS="fontconfig freetype fribidi glew glib libcrypto libglu-mesa \ + libharfbuzz libogg libpng16 libsdl2 libtheora libvorbis mesa17 openal \ + physfs qt5-base qt5-script xorg-libX11 xorg-libXrandr zlib libsdl2-net" } diff -r 4c0950b913fd -r d3adbeea3a9f warzone2100/stuff/patches/fix-icon-path.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/warzone2100/stuff/patches/fix-icon-path.patch Wed Nov 08 19:39:57 2017 +0200 @@ -0,0 +1,15 @@ +--- a/icons/Makefile.am ++++ b/icons/Makefile.am +@@ -16,10 +16,10 @@ + wz2100welcome.bmp + + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(icondir) ++ $(MKDIR_P) $(DESTDIR)$(icondir)/hicolor/128x128/apps + $(MKDIR_P) $(DESTDIR)$(applicationdir) + $(MKDIR_P) $(DESTDIR)$(appdatadir) +- $(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/warzone2100.png ++ $(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/hicolor/128x128/apps/warzone2100.png + $(INSTALL_DATA) $(srcdir)/warzone2100.desktop $(DESTDIR)$(applicationdir)/warzone2100.desktop + $(INSTALL_DATA) $(srcdir)/warzone2100.appdata.xml $(DESTDIR)$(appdatadir)/warzone2100.appdata.xml + diff -r 4c0950b913fd -r d3adbeea3a9f warzone2100/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/warzone2100/stuff/patches/series Wed Nov 08 19:39:57 2017 +0200 @@ -0,0 +1,1 @@ +fix-icon-path.patch