pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xlockmore: Remove, used to update x11/xlockmore
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Mon Jan 24 19:12:45 2022 +0100
Changeset: 9904a6a5b2ff53c4d2158b23e3c7368959d4ee6e
Modified Files:
Makefile
Removed Files:
xlockmore/COMMIT_MSG
xlockmore/DESCR
xlockmore/Makefile
xlockmore/Makefile.common
xlockmore/PLIST
xlockmore/TODO
xlockmore/distinfo
xlockmore/files/INSTALL.pkgsrc
xlockmore/files/pam-xlock-NetBSD
xlockmore/patches/patch-configure
xlockmore/patches/patch-modes_Makefile.in
xlockmore/patches/patch-xlock_XLock.ad
Log Message:
xlockmore: Remove, used to update x11/xlockmore
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9904a6a5b2ff53c4d2158b23e3c7368959d4ee6e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
xlockmore/COMMIT_MSG | 200 ------------------------------
xlockmore/DESCR | 12 --
xlockmore/Makefile | 35 ------
xlockmore/Makefile.common | 148 ----------------------
xlockmore/PLIST | 13 --
xlockmore/TODO | 6 -
xlockmore/distinfo | 9 --
xlockmore/files/INSTALL.pkgsrc | 18 ---
xlockmore/files/pam-xlock-NetBSD | 17 ---
xlockmore/patches/patch-configure | 46 -------
xlockmore/patches/patch-modes_Makefile.in | 30 -----
xlockmore/patches/patch-xlock_XLock.ad | 22 ----
13 files changed, 557 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 8cc851467c..ddd489c5a9 100644
--- a/Makefile
+++ b/Makefile
@@ -5966,7 +5966,6 @@ SUBDIR+= xine-plugin
SUBDIR+= xinetd
SUBDIR+= xinput_calibrator
SUBDIR+= xinvaders3d
-SUBDIR+= xlockmore
SUBDIR+= xlossage-git
SUBDIR+= xmail
SUBDIR+= xmakemol
diff --git a/xlockmore/COMMIT_MSG b/xlockmore/COMMIT_MSG
deleted file mode 100644
index ee2ceab20e..0000000000
--- a/xlockmore/COMMIT_MSG
+++ /dev/null
@@ -1,200 +0,0 @@
-x11/xlockmore: Update to 5.68
-
-5.68
- Updated xscreensaver port for xscreensaver-6.02.
- Various NetBsd install issues fixed including config.cygport.
- pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net.
- Card vulnerability may remain, see README.
- module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is
- still experimental.
- biof mode removed again (though was not building by default).
-
-5.67
- Fixing specified bound equals destination size warning in iostuff.c.
- Port updated for xscreensaver-6.01. With help from EoflaOE ViceCity.
- Also removed some warnings.
- maze3d.c updated for VMS as CRTL now contains more standard functions,
- thanks to Jouk Jansen.
-
-5.66
- GL mode atunnels, juggler3d, atlantis, lament, invert, solitaire, text3d,
- and text3d2 fixed up by EoflaOE ViceCity and myself to build in
- xscreensaver.
- bomb, helix, lightning, penrose, petal, scooter fixes for xscreensaver
- port (clear screen issue). Clock fixed to run by changing a spot from
- "Clock" to "CLOCK".
- A few updates from xscreensaver-5.44/hacks/xlockmore.c for xscreensaver
- port.
- Duplicate resources and unloadable resources for xscreensaver port fixed
- by EoflaOE.
- Double free removed for xscreensaver port fixed by EoflaOE and myself.
- Removed some warnings in xscreensaver port in fzort, rubik, skewb, and
- sproingies.
- Xpm textures added to xscreensaver ports that need them.
- image, puzzle, decay, bat now work but use xscreensaver bitmap/pixmap
- in xscreensaver port.
- Bug fix in qix and toneclock for xscreensaver port, xlock was not
- affected by negative NRAND input.
- euler2d synced up with xscreensaver version.
- Change to fzort to use __asm__ instead of asm as its probably more
- likely to work.
- Fixed solitaire so deckPile changes just a little bit as it doles
- out cards.
- Updated bomb to use size 18 font when USE_MB is not set as it seems
- 34 is not widely available anymore.
- pacman now has different colored ghosts (no green ghost) and also
- oscillating dress and eyes. See README for a notice for this mode.
- Fixed some bad drawings in solitaire and pacman noticed on
- Windows side.
- Warnings removed for -Wstrict-prototypes -Wmissing-prototypes
- -Wdeclaration-after-statement
-
-5.65
- Fix from Jan Kratochvil and Adrian Reber, adrian AT lisas.de for Fedora.
- xlock -startCmd true... would core on Fedora, exit() replaced with
- _exit().
- Update for magick.c to use strncpy thanks to Jouk Jansen.
-
-5.64
- Fix for hyper mode from original author, for potential but not
- likely memory leak and free(NULL) issue John Heidemann, johnh
- AT isi.edu.
- More buffer gcc warnings removed for dclock.c, image.c, and
- scrnsave.c.
- ras.c/magick.c gcc 10 fix from Adrian Reber, adrian AT lisas.de .
- VMS already handles this in make.com.
-
-5.63
- Lots of spelling errors fixed due to codespell
- https://manpages.debian.org/testing/codespell/codespell.1.en.html
- A few more gl modes (molecule, invert) fixed up by
- EoflaOE ViceCity to run in xscreensaver.
- Added additional changes to solitaire and invert. invert will
- build in xscreensaver with some coaxing, see README in
- xscreensaver directory.
- Removed buffer gcc warning about nose.c.
-
-5.62
- Fix from brett.diamond AT gmail.com to get "xlock -help" from
- crashing.
- As a Blake's 7 fan, I had to add the Liberator to star mode.
-
-5.61
- Same fix from Jouk Jansen and Adrian Reber, adrian AT lisas.de
- for juggler3d.cc in previous release.
- Change from Denys Vlasenko (thanks to Adrian Reber for pointing out)
- https://bugzilla.redhat.com/show_bug.cgi?id=874484
- This helps xlock's parent process to know xlock crashed.
- ico mode added truncated octahedron.
- Another gl mode, sierpinski3d, fixed up by EoflaOE ViceCity to run
- in xscreensaver.
-
-5.60
- Updated references to website to https. https://www.sillycycle.com
- A few more gl modes (incl. maze3d, pipe, sproingies) fixed up by
- EoflaOE ViceCity to run in xscreensaver.
-
-5.59
- Thanks to tobik, ohartmann AT walstatt.org, and Jason Helfman,
- jgh AT FreeBSD.org for xglock fixes for "failed due to signal" for
- clang.
- Syncing with xscreensaver and many modes modified, more than
- half working there. pacman and puzzle run but need some
- obvious work, others run too fast or flash on the screen.
- Various fixes from Jouk Jansen and EoflaOE ViceCity.
- Updated GL modes also, inaddition to overlap: biof, skewb, and
- fire (needs images). See xscreensaver/README for new directions.
- Updated in linux to build with modules, must have broken somewhere
- down the line. imake build fixed too.
- bomb mode fixed for xlock.
-
-5.58
- Syncing with xscreensaver. Much has changed since last time this
- was done and much left to do. Nonglx "a"'s and some "b"'s done
- so far. Automata modes like ant.c should use automata.c and
- automata.h supplied by xlockmore.
- ball bat not working right there yet. Also bouboule to do right will
- require changes to xlockmore files from xscreensaver.
- See new xscreensaver/README for instructions.
- While testing uncovered old security bug in anenome mode and fixed.
-
-5.57
- life updates to use a more standard notation for nontotalistic cellular
- automata.
- ax_pthread.m4 needed for autoconf, added back in, oops.
- Removed VMS caddr_t fix from matrix.c, cage.c, gears.c, glplanet.c,
- invert.c, juggler3d.c, lament.c, moebius.c, molecule.c, morph3d.c,
- noof.c, pipes.c, rubik.c, sierpinski3d.c, skewb.c, stairs.c,
- superquadrics.c as no longer needed. Thanks to Jouk Jansen.
- boxed and maze3d modes added thanks mainly to Jouk Jansen.
- boxed added to xlock95.scr. xlock95 Makefile now builds to 64 bit.
-
-5.56
- Thanks to Jason Helfman, jgh AT FreeBSD.org for sound installation fixes.
- Thanks to Tobias Kortkamp, for his patch for glock compile issue with
- CLANG 6.0.0.
- Fixing warnings using clang for back.xpm, nose.c, passwd.c.
- Fixing errors using g++ for deluxe.c, also various casting added.
- Fixing potential some buffer overruns pointed out in mingw in
- apollonian.c and hyper.c.
- Fixing potential error of using null pointer thanks again to mingw in
- xlock.c.
- pyro2 was not showing anything on screen due to it not finding font,
- changed it to default to mode_font if can not find.
-
-5.55
- Thanks to Dave Odell, dmo2118 AT gmail.com for his fzort mode update to
- use the functions in xshm.c and fixes crash when running X11 over network.
- Note from Dave Odell:
- <https://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz>. MI_INIT() is
- defined and documented in hacks/xlockmore.h, with related functions
- defined in hacks/xlockmore.c. MI_INIT() currently takes three parameters:
- the ModeInfo *, the state array, and a function pointer for the new free
- hook. FWIW, it could instead be just the first two parameters, with the
- free hook being set up like the other ModeHooks; this would be a bit
- nicer, I think. But I was going for something that could be applied
- incrementally to individual screenhacks in XScreenSaver, and could -- in
- theory -- be brought back to xlockmore with minimal impact.
- ant mode resync'd with xscreensaver... Thanks to David Odell redoing my
- sad attempt.
- -sound configuration changed around so it should work on more machines,
- now uses DEF_PLAY and play.sh by default.
- Thanks to Stanislav Brabec, sbrabec AT suse.cz for his "hack" to fix for
- PAM with non-English locales. He notes to fix properly a "Password"
- prompt list should be obtained at the initial phase of authentication.
- Added PAM_PASSWORD_PROMPT for using old way.
- Fixed leak in scooter thanks to Valgrind.
-
-5.54
- Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode
- updates to include aligned_malloc.[ch], thread_util.[ch], xshm.[ch],
- and visual_pixmap_depth() from XScreenSaver. Also updates for building
- macOS and Debian for crypt. Made safe for VMS by Jouk Jansen.
- juggle fixed for multiscreens.
-
-5.53
- Goofed on last VMS xmlock update.
- dclock fix for led bounce. :) Added to windows port but only graphical
- part.
- Windows port fixed petri black screen. Added anemone and deluxe but turned
- off double buffering to get default black screen.
-
-5.52
- Install changes for fortune. VMS xmlock build update.
- Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode
- updates. New options -points N and -curve N . Also now working
- for windows port (which led to bubble and ifs porting easily).
-
-5.51
- life3d updates including a distinct 18 neighborhood using rhombic
- dodecahedrons (neighoborhood -18 as there is already 18
- neighborhood), and a 22 neighborhood using tetrahedrons, i.e. the
- tetrahedral part of alternated cubic honeycomb
- Less compile warnings and configure update.
-
-5.50
- -messagefont was broken if USE_MB set (default from 5.42). E.g.:
- -mode dclock -messagefont "-*-times-*-*-*-*-18-*-*-*-*-*-*-*"
- Changed default message font to above.
- Should now compile with less warnings.
- spiral erase mode changed from 100 iterations to 8.
diff --git a/xlockmore/DESCR b/xlockmore/DESCR
deleted file mode 100644
index ade1fff0ff..0000000000
--- a/xlockmore/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-xlock locks the X server until the user enters their password at the
-keyboard. While xlock is running, all new server connections are
-refused. The screen saver is disabled. The mouse cursor is turned
-off. The screen is blanked and a changing pattern is put on the
-screen. If a key or a mouse button is pressed then the user is
-prompted for the password of the user who started xlock.
-
-If the correct password is typed, then the screen is unlocked and the
-X server is restored. When typing the password, Control-U and
-Control-H are active as kill and erase respectively. To return to the
-locked screen, click in the small icon version of the changing
-pattern.
diff --git a/xlockmore/Makefile b/xlockmore/Makefile
deleted file mode 100644
index 2c03b01a26..0000000000
--- a/xlockmore/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD$
-
-#PKGREVISION= 1
-.include "Makefile.common"
-
-COMMENT= Like the XLock session-locker/screensaver, but with more
-
-CONFLICTS+= xlockmore-lite-[0-9]*
-
-CONFIGURE_ARGS+= --with-opengl
-CONFIGURE_ARGS+= --with-mesa
-CONFIGURE_ARGS+= --without-ftgl
-CONFIGURE_ARGS+= --without-ttf
-XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
-CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
-OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
-CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
-MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
-CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
-#BUILDLINK_TRANSFORM+= l:MesaGL:GL
-#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
-XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
-CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
-
-PLIST_SUBST+= LITE=""
-
-USE_TOOLS+= pkg-config
-
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/xlockmore/Makefile.common b/xlockmore/Makefile.common
deleted file mode 100644
index df5df46e01..0000000000
--- a/xlockmore/Makefile.common
+++ /dev/null
@@ -1,148 +0,0 @@
-# $NetBSD$
-#
-# used by ../../x11/xlockmore/Makefile
-# used by ../../x11/xlockmore-lite/Makefile
-
-DISTNAME= xlockmore-5.68
-CATEGORIES= x11
-MASTER_SITES= http://sillycycle.com/xlock/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://sillycycle.com/xlockmore.html
-# Similar to BSD license, but uses different words (see xlockmore.spec)
-LICENSE= 2-clause-bsd
-
-DISTINFO_FILE?= ${.CURDIR}/../../wip/xlockmore/distinfo
-PATCHDIR?= ${.CURDIR}/../../wip/xlockmore/patches
-PLIST_SRC?= ${.CURDIR}/../../wip/xlockmore/PLIST
-FILESDIR?= ${.CURDIR}/../../wip/xlockmore/files
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore
-PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam
-.if ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+= oss
-.endif
-PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
-PKG_OPTIONS_LEGACY_VARS+= XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
-PKG_OPTIONS_LEGACY_VARS+= XLOCK_NO_DPMS:-xlockmore-dpms
-
-.include "../../mk/bsd.options.mk"
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= xmkmf
-
-XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock/modules
-DEFINES+= -DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
-CPPFLAGS+= ${DEFINES}
-CXXFLAGS+= ${DEFINES}
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --without-motif
-CONFIGURE_ARGS+= --without-editres
-CONFIGURE_ARGS+= --without-dtsaver
-CONFIGURE_ARGS+= --without-rplay
-CONFIGURE_ARGS+= --without-nas
-CONFIGURE_ARGS+= --without-gtk
-CONFIGURE_ARGS+= --without-esound
-CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
-CONFIGURE_ENV+= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock
-
-OWN_DIRS+= ${PREFIX}/lib/X11/app-defaults
-CONF_FILES+= ${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
-
-.if ${OPSYS} == "NetBSD"
-XLOCK_AUDIOPLAY?= /usr/bin/audioplay
-CONFIGURE_ARGS+= --enable-def-play=${XLOCK_AUDIOPLAY:Q}
-.endif
-
-.if empty(PKG_OPTIONS:Mxlockmore-dpms)
-CONFIGURE_ARGS+= --without-dpms
-.else
-. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
-BUILDLINK_TRANSFORM+= l:Xdpms:Xext
-. endif
-DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
-CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q}
-.endif
-
-.if empty(PKG_OPTIONS:Mxlockmore-allow-root)
-CONFIGURE_ARGS+= --disable-allow-root
-.endif
-
-.if !empty(PKG_OPTIONS:Mpam)
-. include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-pam --enable-bad-pam
-. if ${OPSYS} == "NetBSD"
-# needed to read shadow passwords
-DEPENDS+= pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
-. endif
-.else
-CONFIGURE_ARGS+= --disable-pam
-
-#
-# Special permissions of bin/xlock if any.
-#
-. if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \
- ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
-SPECIAL_PERMS+= bin/xlock ${SETUID_ROOT_PERMS}
-. elif ${OPSYS} == "Linux"
-# setgid shadow should be enough for modern Linux
-SPECIAL_PERMS+= bin/xlock ${REAL_ROOT_USER} shadow 2511
-. endif
-.endif
-
-EGDIR= ${PREFIX}/share/examples/xlock
-MESSAGE_SUBST+= EGDIR=${EGDIR:Q}
-INSTALLATION_DIRS+= ${EGDIR}/pam.d
-INSTALLATION_DIRS+= share/doc/xlockmore
-
-# XXX framework bug: while we don't need it, this would kill
-# the inherited full dependency
-#BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-
-XINERAMA_ENV= no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
-CONFIGURE_ENV+= ac_cv_path_xinerama=${XINERAMA_ENV:Q}
-
-# Modify paths in application defaults
-SUBST_CLASSES+= adef
-SUBST_STAGE.adef= pre-configure
-SUBST_MESSAGE.adef= Preparing paths in xlock/XLock.ad file ...
-SUBST_FILES.adef= xlock/XLock.ad
-SUBST_SED.adef= -e 's|/usr/lib/|${PREFIX}/lib/|g'
-SUBST_SED.adef+= -e 's|/usr/local/share/|${PREFIX}/share/|g'
-
-# Set the default xlock mode/screensaver.
-# XLOCK_DEFAULT_MODE can be defined by the user in mk.conf
-SUBST_CLASSES+= mode
-SUBST_STAGE.mode= pre-configure
-SUBST_MESSAGE.mode= Preparing default mode in xlock/XLock.ad file ...
-SUBST_FILES.mode= xlock/XLock.ad
-SUBST_SED.mode= -e 's|^\(XLock.mode:[ ]*\).*|\1${XLOCK_DEFAULT_MODE}|'
-
-# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
-SUBST_CLASSES+= install
-SUBST_STAGE.install= post-configure
-SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
-SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
-SUBST_VARS.install= PREFIX
-SUBST_VARS.install+= EGDIR
-
-post-patch:
- ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/pam-xlock-NetBSD \
- ${DESTDIR}${EGDIR}/pam.d/xlock-NetBSD
- ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
- ${DESTDIR}${PREFIX}/share/doc/xlockmore/INSTALL.pkgsrc
diff --git a/xlockmore/PLIST b/xlockmore/PLIST
deleted file mode 100644
index 90eb88bd58..0000000000
--- a/xlockmore/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD$
-bin/play.sh
-${LITE}bin/xglock
-bin/xlock
-man/man1/xlock.1
-share/doc/xlockmore/INSTALL.pkgsrc
-share/examples/xlock/app-defaults/XLock
-share/examples/xlock/pam.d/xlock-NetBSD
-share/xlock/sounds/complete.au
-share/xlock/sounds/identify-please.au
-share/xlock/sounds/not-programmed.au
-share/xlock/sounds/thank-you.au
-${LITE}share/xlock/xglockrc
diff --git a/xlockmore/TODO b/xlockmore/TODO
deleted file mode 100644
index 73533c8fc4..0000000000
--- a/xlockmore/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-[X] Modify patches for new version
-[X] License is missing
-[X] Check paths in "patch-xlock_XLock.ad"
-[X] Use SUBST framework for "Makefile.common"
-[X] Check whether CVE-2006-0061 is fixed
-[X] Move MESSAGE to ${PREFIX}/share/doc
diff --git a/xlockmore/distinfo b/xlockmore/distinfo
deleted file mode 100644
index f5b17d343a..0000000000
--- a/xlockmore/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.58 2021/10/26 11:34:51 nia Exp $
-
-SHA1 (xlockmore-5.68.tar.xz) = 0aaf11f75d2460b76cd2c55298183827203b8ddd
-RMD160 (xlockmore-5.68.tar.xz) = 65a6ee1356cd6eb050c2a883dede01b27323a435
-SHA512 (xlockmore-5.68.tar.xz) = e884ac8395bfee21eedecbe0652eaa8bcae10e8f56896d7f3f5e970d40a87f002b7fb248caa0d981ea815e0fcfda6a1e8529c618c8c073b7f0b44b58abde17d4
-Size (xlockmore-5.68.tar.xz) = 1998852 bytes
-SHA1 (patch-configure) = eb2706b4de9d6212ab183ddf4faeaac6f598ca86
-SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
-SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a
diff --git a/xlockmore/files/INSTALL.pkgsrc b/xlockmore/files/INSTALL.pkgsrc
deleted file mode 100644
index 8ea2ec6b84..0000000000
--- a/xlockmore/files/INSTALL.pkgsrc
+++ /dev/null
@@ -1,18 +0,0 @@
-If xlockmore is built with the "pam" option:
-In order to make unlocking work, you need to add an
-xlock file to your pam configuration directory (usually
-/etc/pam.d). You can find a sample file in:
-
- @EGDIR@/pam.d/xlock-NetBSD
-
-On NetBSD, the "pam_pwauth_suid.so" module can be used to authenticate
-against a shadow password database. Note that use of this module might
-allow programs with your privileges to get a copy of your plaintext
-password as typed in for unlocking. The advantage is that with that
-module, the suid bit of the
-
- @PREFIX@/bin/xlock
-
-executable can be removed.
-Per default, xlockmore is installed setuid root. Since this is a
-relatively complex program, there is the risk of other exploits.
diff --git a/xlockmore/files/pam-xlock-NetBSD b/xlockmore/files/pam-xlock-NetBSD
deleted file mode 100644
index ca11097144..0000000000
--- a/xlockmore/files/pam-xlock-NetBSD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: pam-xlock-NetBSD,v 1.1 2012/03/28 20:21:46 drochner Exp $
-#
-# PAM configuration for the "xlock" service
-#
-
-# auth
-#auth sufficient pam_pwauth_suid.so
-auth include system
-
-# account
-account include system
-
-# session
-session include system
-
-# password
-password include system
diff --git a/xlockmore/patches/patch-configure b/xlockmore/patches/patch-configure
deleted file mode 100644
index d417a4f70b..0000000000
--- a/xlockmore/patches/patch-configure
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-Modify handling of LDFLAGS.
-Rejected by upstream.
-
---- configure.orig 2020-06-04 14:43:47.000000000 +0000
-+++ configure
-@@ -10833,10 +10833,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
- dirname=`which gcc`
- dirname=`dirname $dirname`
- dirname=`dirname $dirname`/lib
-- if test "$dirname" != "/lib"; then
-- XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-- XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-- fi
-+# if test "$dirname" != "/lib"; then
-+# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-+# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-+# fi
- fi
- case "${canonical}" in
- *-*-freebsd* )
-@@ -10896,6 +10896,8 @@ _ACEOF
- if test "x$ac_cv_header_elf_h" = xyes; then :
-
- $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
-+XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
-+XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
-
- fi
-
-@@ -11006,10 +11008,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
- dirname=`which gcc`
- dirname=`dirname $dirname`
- dirname=`dirname $dirname`/lib
-- if test "$dirname" != "/lib"; then
-- XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-- XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-- fi
-+# if test "$dirname" != "/lib"; then
-+# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-+# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-+# fi
- fi
- XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}"
- XMLOCKLDFLAGS="-R${XMLOCK_LDFLAGS}"
diff --git a/xlockmore/patches/patch-modes_Makefile.in b/xlockmore/patches/patch-modes_Makefile.in
deleted file mode 100644
index 8bc0b84ec5..0000000000
--- a/xlockmore/patches/patch-modes_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Use INSTALL properly.
-First part was rejected by upstream.
-Second part is not suitable for upstream.
-
---- modes/Makefile.in.orig 2021-12-17 04:47:25.000000000 +0000
-+++ modes/Makefile.in
-@@ -633,7 +633,7 @@ install : install-program install-man in
-
- install-program : xlock
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
- @MODULES@mkdir -p $(DESTDIR)$(DEF_MODULEPATH)
- @MODULES@cp *.xlk $(DESTDIR)$(DEF_MODULEPATH)
- @MODULES@cp glx/*.xlk $(DESTDIR)$(DEF_MODULEPATH)
-@@ -644,9 +644,10 @@ install-man :
-
- install-ad :
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
-- $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)${datarootdir}/examples/xlock/app-defaults
-+ $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
- @FORTUNE@sed 's;^XLock.program: fortune;XLock.program: $(FORTUNE);' $(UTILDIR)XLock.ad > $(UTILOBJDIR)XLock.ad.tmp
-- @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)$(xapploaddir)/XLock
-+ @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
- @FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
-
- install-sound :
diff --git a/xlockmore/patches/patch-xlock_XLock.ad b/xlockmore/patches/patch-xlock_XLock.ad
deleted file mode 100644
index 4612d30feb..0000000000
--- a/xlockmore/patches/patch-xlock_XLock.ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Modify path for fortune.
-Not suitable for upstream.
-
---- xlock/XLock.ad.orig 2019-05-30 01:30:03.000000000 +0000
-+++ xlock/XLock.ad
-@@ -67,12 +67,12 @@ XLock.left3d: Red
- XLock.both3d: Magenta
-
- ! For marquee & nose modes
--XLock.program: fortune -s
-+!XLock.program: fortune -s
- !XLock.program: fortune -o
- !XLock.program: fortune -s
- !XLock.program: fortune
- !XLock.program: /usr/games/fortune -o
--!XLock.program: /usr/games/fortune -s
-+XLock.program: /usr/games/fortune -s
- !XLock.program: /usr/games/fortune
- !XLock.program: finger
- !XLock.messagesfile: fortune.dat
Home |
Main Index |
Thread Index |
Old Index