cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xscreensaver-5.10.

Browse Source 
* Retired hypercube and hyperball, which are redundant with polytopes.
* New hack, rubikblocks.
* Fixed another potential RANDR crash.
* molecule now correctly displays PDB 3.2 files.
* Updates to mirrorblob, glhanoi, and sonar.
* Rewritten version of klein hack.
* New hack, surfaces, incorporating objects from old klein hack, plus new ones.
* Merged juggle and juggler3d hacks.
* Fixed intermittent failure in xscreensaver-command.
This commit is contained in:
ajacoutot 2009-11-28 10:49:49 +00:00
parent 63fc1bddd3
commit 4f1d61da89
6 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/xscreensaver/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.57 2009/08/20 07:03:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.58 2009/11/28 10:49:49 ajacoutot Exp $
COMMENT-main= screen saver and locker for the X Window System
COMMENT-data= graphical demos (savers) for screensavers
COMMENT-gle= OpenGL Extrusion library support for screensaver-data
V= 5.08
V= 5.10
DISTNAME= xscreensaver-${V}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-data= xscreensaver-data-${V}p0
PKGNAME-gle= xscreensaver-gle-${V}p1
PKGNAME-main= ${DISTNAME}
PKGNAME-data= xscreensaver-data-${V}
PKGNAME-gle= xscreensaver-gle-${V}
CATEGORIES= x11

10
x11/xscreensaver/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xscreensaver-5.08.tar.gz) = ed6nCMkVNB8gXgAximmb6Q==
RMD160 (xscreensaver-5.08.tar.gz) = 83uoh6ZWpP/RTzgJ3jJpgGJxNS0=
SHA1 (xscreensaver-5.08.tar.gz) = TmiJ1xcerxi4VsSEqH1XAXh+XcY=
SHA256 (xscreensaver-5.08.tar.gz) = Y4yxRVzV/gyV9TzwSLm0b1sMzOAmw5JG0Nxl67Ccqd0=
SIZE (xscreensaver-5.08.tar.gz) = 5466460
MD5 (xscreensaver-5.10.tar.gz) = DXIF+dqOPxuDvNpUnXOnxA==
RMD160 (xscreensaver-5.10.tar.gz) = bEN++JlpoL+IbyeyQwtTpDEUayA=
SHA1 (xscreensaver-5.10.tar.gz) = 2DeZKN4ubobMexfXUVDar+V+k8Q=
SHA256 (xscreensaver-5.10.tar.gz) = VO3aAy+dHgc3/cNKdMn0C6m+lE9oe+bxVexxzE8J/h8=
SIZE (xscreensaver-5.10.tar.gz) = 5561162

16
x11/xscreensaver/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2008/12/28 18:41:20 ajacoutot Exp $
--- configure.orig Sun Dec 28 08:59:19 2008
+++ configure Sun Dec 28 17:25:11 2008
@@ -9376,7 +9376,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
$OpenBSD: patch-configure,v 1.12 2009/11/28 10:49:49 ajacoutot Exp $
--- configure.orig Tue Sep 8 06:54:40 2009
+++ configure Sat Nov 28 11:15:05 2009
@@ -9387,7 +9387,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.11 2008/12/28 18:41:20 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9443,7 +9443,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
@@ -9454,7 +9454,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.11 2008/12/28 18:41:20 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9512,7 +9512,7 @@ fi
@@ -9523,7 +9523,7 @@ fi
fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.11 2008/12/28 18:41:20 ajacoutot Exp $
fi
if test "$gt_cv_func_dgettext_libc" = "yes" \
@@ -16472,13 +16472,13 @@ echo "${ECHO_T}adding \"$osx_crud\" to GL_LIBS" >&6; }
@@ -16460,13 +16460,13 @@ echo "${ECHO_T}adding \"$osx_crud\" to GL_LIBS" >&6; }
# link -lpthread after the Mesa libs (be they named -lGL or -lMesaGL.)
#
if test "$ac_have_mesa_gl" = yes; then
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.11 2008/12/28 18:41:20 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -16534,7 +16534,7 @@ fi
@@ -16522,7 +16522,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then

8
x11/xscreensaver/patches/patch-driver_XScreenSaver_ad_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.7 2008/12/28 18:41:20 ajacoutot Exp $
--- driver/XScreenSaver.ad.in.orig Sun Dec 28 08:33:15 2008
+++ driver/XScreenSaver.ad.in Sun Dec 28 17:25:12 2008
@@ -173,7 +173,7 @@ GetViewPortIsFullOfLies: False
$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.8 2009/11/28 10:49:49 ajacoutot Exp $
--- driver/XScreenSaver.ad.in.orig Tue Sep 8 06:53:15 2009
+++ driver/XScreenSaver.ad.in Sat Nov 28 11:15:05 2009
@@ -172,7 +172,7 @@ GetViewPortIsFullOfLies: False
bouboule -root \n\
- braid -root \n\
coral -root \n\

16
x11/xscreensaver/patches/patch-driver_mlstring_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-driver_mlstring_c,v 1.1 2009/08/20 07:03:15 ajacoutot Exp $
Fix local screen lock bypass vulnerability.
Debian bug #539699.
--- driver/mlstring.c.orig Tue Apr 17 06:51:48 2007
+++ driver/mlstring.c Thu Aug 20 08:59:21 2009
@@ -153,6 +153,8 @@ mlstring_wrap(mlstring *mstring, XFontStruct *font, Di
if (wrap_at == -1) /* No space found, hard wrap */
wrap_at = line_length;
+ else
+ wrap_at++; /* Leave space at the end of the line */
newml = calloc(1, sizeof(*newml));
if (!newml) /* OOM, don't bother trying to wrap */

23
x11/xscreensaver/pkg/PLIST-data
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-data,v 1.2 2008/12/28 18:41:21 ajacoutot Exp $
@comment $OpenBSD: PLIST-data,v 1.3 2009/11/28 10:49:49 ajacoutot Exp $
@conflict xscreensaver-<5.07p3
@conflict xscreensaver-<5.07p3-no_gle
libexec/xscreensaver/
@ -88,8 +88,6 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/halo
@bin libexec/xscreensaver/helix
@bin libexec/xscreensaver/hopalong
@bin libexec/xscreensaver/hyperball
@bin libexec/xscreensaver/hypercube
@bin libexec/xscreensaver/hypertorus
@bin libexec/xscreensaver/hypnowheel
@bin libexec/xscreensaver/ifs
@ -99,7 +97,6 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/intermomentary
@bin libexec/xscreensaver/jigglypuff
@bin libexec/xscreensaver/jigsaw
@bin libexec/xscreensaver/juggle
@bin libexec/xscreensaver/juggler3d
@bin libexec/xscreensaver/julia
@bin libexec/xscreensaver/kaleidescope
@ -154,6 +151,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/rorschach
@bin libexec/xscreensaver/rotzoomer
@bin libexec/xscreensaver/rubik
@bin libexec/xscreensaver/rubikblocks
@bin libexec/xscreensaver/sballs
@bin libexec/xscreensaver/shadebobs
@bin libexec/xscreensaver/sierpinski
@ -174,6 +172,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/strange
@bin libexec/xscreensaver/substrate
@bin libexec/xscreensaver/superquadrics
@bin libexec/xscreensaver/surfaces
@bin libexec/xscreensaver/swirl
@bin libexec/xscreensaver/tangram
@bin libexec/xscreensaver/thornbird
@ -252,6 +251,7 @@ libexec/xscreensaver/webcollage
@man man/man6/epicycle.6
@man man/man6/eruption.6
@man man/man6/euler2d.6
@man man/man6/extrusion.6
@man man/man6/fadeplot.6
@man man/man6/fiberlamp.6
@man man/man6/fireworkx.6
@ -286,8 +286,6 @@ libexec/xscreensaver/webcollage
@man man/man6/halo.6
@man man/man6/helix.6
@man man/man6/hopalong.6
@man man/man6/hyperball.6
@man man/man6/hypercube.6
@man man/man6/hypertorus.6
@man man/man6/hypnowheel.6
@man man/man6/ifs.6
@ -297,7 +295,6 @@ libexec/xscreensaver/webcollage
@man man/man6/intermomentary.6
@man man/man6/jigglypuff.6
@man man/man6/jigsaw.6
@man man/man6/juggle.6
@man man/man6/juggler3d.6
@man man/man6/julia.6
@man man/man6/kaleidescope.6
@ -350,6 +347,7 @@ libexec/xscreensaver/webcollage
@man man/man6/rorschach.6
@man man/man6/rotzoomer.6
@man man/man6/rubik.6
@man man/man6/rubikblocks.6
@man man/man6/sballs.6
@man man/man6/shadebobs.6
@man man/man6/sierpinski.6
@ -370,6 +368,7 @@ libexec/xscreensaver/webcollage
@man man/man6/strange.6
@man man/man6/substrate.6
@man man/man6/superquadrics.6
@man man/man6/surfaces.6
@man man/man6/swirl.6
@man man/man6/tangram.6
@man man/man6/thornbird.6
@ -454,6 +453,7 @@ share/applications/screensavers/engine.desktop
share/applications/screensavers/epicycle.desktop
share/applications/screensavers/eruption.desktop
share/applications/screensavers/euler2d.desktop
share/applications/screensavers/extrusion.desktop
share/applications/screensavers/fadeplot.desktop
share/applications/screensavers/fiberlamp.desktop
share/applications/screensavers/fireworkx.desktop
@ -524,6 +524,7 @@ share/applications/screensavers/memscroller.desktop
share/applications/screensavers/menger.desktop
share/applications/screensavers/metaballs.desktop
share/applications/screensavers/mirrorblob.desktop
share/applications/screensavers/mismunch.desktop
share/applications/screensavers/moebius.desktop
share/applications/screensavers/moebiusgears.desktop
share/applications/screensavers/moire.desktop
@ -562,6 +563,7 @@ share/applications/screensavers/rorschach.desktop
share/applications/screensavers/rotor.desktop
share/applications/screensavers/rotzoomer.desktop
share/applications/screensavers/rubik.desktop
share/applications/screensavers/rubikblocks.desktop
share/applications/screensavers/sballs.desktop
share/applications/screensavers/shadebobs.desktop
share/applications/screensavers/sierpinski.desktop
@ -584,6 +586,7 @@ share/applications/screensavers/stonerview.desktop
share/applications/screensavers/strange.desktop
share/applications/screensavers/substrate.desktop
share/applications/screensavers/superquadrics.desktop
share/applications/screensavers/surfaces.desktop
share/applications/screensavers/swirl.desktop
share/applications/screensavers/t3d.desktop
share/applications/screensavers/tangram.desktop
@ -668,6 +671,7 @@ share/xscreensaver/config/engine.xml
share/xscreensaver/config/epicycle.xml
share/xscreensaver/config/eruption.xml
share/xscreensaver/config/euler2d.xml
share/xscreensaver/config/extrusion.xml
share/xscreensaver/config/fadeplot.xml
share/xscreensaver/config/fiberlamp.xml
share/xscreensaver/config/fireworkx.xml
@ -702,8 +706,6 @@ share/xscreensaver/config/halftone.xml
share/xscreensaver/config/halo.xml
share/xscreensaver/config/helix.xml
share/xscreensaver/config/hopalong.xml
share/xscreensaver/config/hyperball.xml
share/xscreensaver/config/hypercube.xml
share/xscreensaver/config/hypertorus.xml
share/xscreensaver/config/hypnowheel.xml
share/xscreensaver/config/ifs.xml
@ -713,7 +715,6 @@ share/xscreensaver/config/interference.xml
share/xscreensaver/config/intermomentary.xml
share/xscreensaver/config/jigglypuff.xml
share/xscreensaver/config/jigsaw.xml
share/xscreensaver/config/juggle.xml
share/xscreensaver/config/juggler3d.xml
share/xscreensaver/config/julia.xml
share/xscreensaver/config/kaleidescope.xml
@ -767,6 +768,7 @@ share/xscreensaver/config/rocks.xml
share/xscreensaver/config/rorschach.xml
share/xscreensaver/config/rotzoomer.xml
share/xscreensaver/config/rubik.xml
share/xscreensaver/config/rubikblocks.xml
share/xscreensaver/config/sballs.xml
share/xscreensaver/config/shadebobs.xml
share/xscreensaver/config/sierpinski.xml
@ -787,6 +789,7 @@ share/xscreensaver/config/stonerview.xml
share/xscreensaver/config/strange.xml
share/xscreensaver/config/substrate.xml
share/xscreensaver/config/superquadrics.xml
share/xscreensaver/config/surfaces.xml
share/xscreensaver/config/swirl.xml
share/xscreensaver/config/tangram.xml
share/xscreensaver/config/thornbird.xml