From f8462efa2b9d1e1125e8ad8f927633b0d67dd729 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sun, 16 Feb 2014 07:00:29 +0700 Subject: [PATCH] mate-screensaver: moved to extra Signed-off-by: Willy Sudiarto Raharjo --- MATE-1.8-CHANGES.TXT | 1 + UPGRADE.TXT | 11 +++++++++++ extra/mate-screensaver/README | 3 +++ {testing => extra}/mate-screensaver/doinst.sh | 0 .../mate-screensaver/mate-screensaver.SlackBuild | 6 +++--- {testing => extra}/mate-screensaver/slack-desc | 0 mate-build-extra.sh | 1 + testing/mate-build-testing.sh | 3 +-- testing/mate-screensaver/README | 7 ------- testing/mate-screensaver/mate-screensaver.pam | 2 -- 10 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 extra/mate-screensaver/README rename {testing => extra}/mate-screensaver/doinst.sh (100%) rename {testing => extra}/mate-screensaver/mate-screensaver.SlackBuild (96%) rename {testing => extra}/mate-screensaver/slack-desc (100%) delete mode 100644 testing/mate-screensaver/README delete mode 100644 testing/mate-screensaver/mate-screensaver.pam diff --git a/MATE-1.8-CHANGES.TXT b/MATE-1.8-CHANGES.TXT index abc38c2..8cbf3ad 100644 --- a/MATE-1.8-CHANGES.TXT +++ b/MATE-1.8-CHANGES.TXT @@ -8,6 +8,7 @@ pygtksourceview pangox-compat pygobject3 gnome-main-menu +mate-screensaver Renamed Packages in MATE 1.8: mate-file-manager -> caja diff --git a/UPGRADE.TXT b/UPGRADE.TXT index 9833355..1d81364 100644 --- a/UPGRADE.TXT +++ b/UPGRADE.TXT @@ -34,6 +34,7 @@ from official repository at http://www.slackware.org.uk/msb/ or any other mirror removepkg mate-character-map 3. Remove renamed packages + removepkg mate-file-manager removepkg mate-window-manager removepkg mate-document-viewer @@ -45,6 +46,16 @@ from official repository at http://www.slackware.org.uk/msb/ or any other mirror You will notice that some of the files are found on other packages and it will not be deleted. That's fine, since these packages gets a new name on MATE 1.8 (see MATE-1.8-CHANGES.TXT). +4. Remove PAM-related packages (optional) + + If you happened to install pam/pam_unix2 packages in MATE 1.6 to get mate-screensaver working + for desktop locking feature, you will be glad to know that mate-screensaver is now moved to + extra and without the need of pam and pam_unix2 libraries anymore. + So these two packages can be safely deleted. + + removepkg pam + removepkg pam_unix2 + At this point you should be running MATE 1.8 on Slackware 14.1. :-) I wish everyone good luck with this! diff --git a/extra/mate-screensaver/README b/extra/mate-screensaver/README new file mode 100644 index 0000000..7693d2e --- /dev/null +++ b/extra/mate-screensaver/README @@ -0,0 +1,3 @@ +mate-screensaver is a screensaver and screen locker that aims +to have simple, sane, and secure defaults and be well integrated +with the MATE desktop. diff --git a/testing/mate-screensaver/doinst.sh b/extra/mate-screensaver/doinst.sh similarity index 100% rename from testing/mate-screensaver/doinst.sh rename to extra/mate-screensaver/doinst.sh diff --git a/testing/mate-screensaver/mate-screensaver.SlackBuild b/extra/mate-screensaver/mate-screensaver.SlackBuild similarity index 96% rename from testing/mate-screensaver/mate-screensaver.SlackBuild rename to extra/mate-screensaver/mate-screensaver.SlackBuild index 0ec7878..1da7ce9 100644 --- a/testing/mate-screensaver/mate-screensaver.SlackBuild +++ b/extra/mate-screensaver/mate-screensaver.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=mate-screensaver VERSION=${VERSION:-1.7.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_msb} if [ -z "$ARCH" ]; then @@ -115,8 +115,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/etc/pam.d/ -install -m644 $CWD/mate-screensaver.pam $PKG/etc/pam.d/mate-screensaver +# use setuid to make this work without PAM +chmod 4755 $PKG/usr/libexec/mate-screensaver-dialog mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/testing/mate-screensaver/slack-desc b/extra/mate-screensaver/slack-desc similarity index 100% rename from testing/mate-screensaver/slack-desc rename to extra/mate-screensaver/slack-desc diff --git a/mate-build-extra.sh b/mate-build-extra.sh index 5640b1f..a94d3c5 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -76,6 +76,7 @@ for dir in \ deps/liboobs \ extra/mate-system-tools \ extra/gnome-main-menu \ + extra/mate-screensaver \ ; do # Get the package name package=$(echo $dir | cut -f2- -d /) diff --git a/testing/mate-build-testing.sh b/testing/mate-build-testing.sh index e70eef6..6a424e0 100644 --- a/testing/mate-build-testing.sh +++ b/testing/mate-build-testing.sh @@ -40,7 +40,6 @@ MSBROOT=$(pwd) for dir in \ pam \ pam_unix2 \ - mate-screensaver \ ; do # Get the package name package=$(echo $dir | cut -f2- -d /) @@ -74,4 +73,4 @@ for dir in \ # back to original directory cd $MSBROOT -done \ No newline at end of file +done diff --git a/testing/mate-screensaver/README b/testing/mate-screensaver/README deleted file mode 100644 index fd5d5cf..0000000 --- a/testing/mate-screensaver/README +++ /dev/null @@ -1,7 +0,0 @@ -mate-screensaver is a screensaver and screen locker that aims -to have simple, sane, and secure defaults and be well integrated -with the MATE desktop. - -mate-screensaver works normally without any dependencies (assuming you -have install all packages in /deps, /base, and /extra, but it requires -pam and pam_unix2 in order to lock the desktop \ No newline at end of file diff --git a/testing/mate-screensaver/mate-screensaver.pam b/testing/mate-screensaver/mate-screensaver.pam deleted file mode 100644 index 6dc5b93..0000000 --- a/testing/mate-screensaver/mate-screensaver.pam +++ /dev/null @@ -1,2 +0,0 @@ -#%PAM-1.0 -auth required pam_unix_auth.so