diff options
Diffstat (limited to 'security/gringotts')
| -rw-r--r-- | security/gringotts/Makefile | 14 | ||||
| -rw-r--r-- | security/gringotts/distinfo | 2 | ||||
| -rw-r--r-- | security/gringotts/files/patch-grg_pwd.c | 37 | ||||
| -rw-r--r-- | security/gringotts/files/patch-grg_safe.c | 37 | ||||
| -rw-r--r-- | security/gringotts/pkg-plist | 13 |
5 files changed, 55 insertions, 48 deletions
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile index 5a0f3260f2bd..04172d10b434 100644 --- a/security/gringotts/Makefile +++ b/security/gringotts/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gringotts -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= security MASTER_SITES= http://devel.pluto.linux.it/projects/Gringotts/current/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -18,6 +18,7 @@ LIB_DEPENDS= gringotts.2:${PORTSDIR}/security/libgringotts \ popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes +USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOMENG= yes USE_REINPLACE= yes @@ -29,12 +30,19 @@ CONFIGURE_ARGS+= --disable-env-check .if ${HAVE_GNOME:Mgnomehier}!="" USE_GNOME+= gnomehier +PLIST_SUB+= GNOMEHIER='' +.else +PLIST_SUB+= GNOMEHIER='@comment ' .endif post-patch: - ${REINPLACE_CMD} -e "s|md5sum|md5|g" ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e "s|mlock|mlockall|g" ${WRKSRC}/configure + ${REINPLACE_CMD} -E -e "s|^(gringottsdocdir =).*|gringottsdocdir = $$\(datadir\)/doc/gringotts|;s|md5sum|md5|g" ${WRKSRC}/Makefile.in +.if defined(NOPORTDOCS) + ${REINPLACE_CMD} -E -e "s|^(install-data-am:.*)install-gringottsdocDATA|\1|" ${WRKSRC}/Makefile.in +.endif .if ${HAVE_GNOME:Mgnomehier}=="" - ${REINPLACE_CMD} -E "s|(MAKE.*AM_MAKEFLAGS.*install-exec-am).*|\1|" \ + ${REINPLACE_CMD} -E -e "s|^(install-data-am:.*)install-DsktpDATA|\1|" \ ${WRKSRC}/Makefile.in .endif diff --git a/security/gringotts/distinfo b/security/gringotts/distinfo index 27d8aaf5455f..61166acb1c87 100644 --- a/security/gringotts/distinfo +++ b/security/gringotts/distinfo @@ -1 +1 @@ -MD5 (gringotts-1.2.1.tar.bz2) = 1460fc3e52b1bca9c472212a78b5197f +MD5 (gringotts-1.2.2.tar.bz2) = 2f4f77392384336d5930825b5ea3ebf1 diff --git a/security/gringotts/files/patch-grg_pwd.c b/security/gringotts/files/patch-grg_pwd.c deleted file mode 100644 index 419161f41e9e..000000000000 --- a/security/gringotts/files/patch-grg_pwd.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/grg_pwd.c.orig Sat Nov 23 20:32:53 2002 -+++ src/grg_pwd.c Sat Nov 23 20:34:32 2002 -@@ -23,7 +23,6 @@ - #include <fcntl.h> - #include <sys/stat.h> - #include <sys/mman.h> --#include <linux/fd.h> - #include <sys/ioctl.h> - #include <signal.h> - -@@ -129,7 +128,6 @@ - gint fd, len; - gchar *file; - GRG_KEY key = NULL; -- struct floppy_drive_struct fstruct; - - fd = open ("/dev/fd0", O_RDONLY); - -@@ -138,18 +136,6 @@ - { - grg_msg (_("Please insert a disk in the first floppy drive"), - GTK_MESSAGE_ERROR, dlg); -- return NULL; -- } -- -- //check for write protection -- ioctl (fd, FDGETDRVSTAT, &fstruct); -- -- if ((fstruct.flags >> FD_DISK_WRITABLE_BIT) & 1) -- { -- grg_msg (_ -- ("The disk is not write protected. For security reasons, I'll not use it."), -- GTK_MESSAGE_ERROR, dlg); -- close (fd); - return NULL; - } - diff --git a/security/gringotts/files/patch-grg_safe.c b/security/gringotts/files/patch-grg_safe.c index f189066e6063..5ce852a3254b 100644 --- a/security/gringotts/files/patch-grg_safe.c +++ b/security/gringotts/files/patch-grg_safe.c @@ -1,5 +1,5 @@ ---- src/grg_safe.c.orig Sat Nov 23 18:42:36 2002 -+++ src/grg_safe.c Sat Nov 23 18:43:22 2002 +--- src/grg_safe.c.orig Thu Dec 5 15:10:07 2002 ++++ src/grg_safe.c Sat Jan 4 19:53:18 2003 @@ -33,6 +33,7 @@ #include <stdlib.h> @@ -8,7 +8,7 @@ #include <regex.h> #include <unistd.h> #include <fcntl.h> -@@ -42,7 +43,6 @@ +@@ -43,7 +44,6 @@ #include <sys/fsuid.h> #endif #include <sys/time.h> @@ -16,7 +16,7 @@ #include <sys/resource.h> #define GRG_SAFE 0 -@@ -56,8 +56,6 @@ +@@ -57,8 +57,6 @@ grg_mlockall_and_drop_root_privileges (void) { //drop eventual group root privileges @@ -25,7 +25,16 @@ #ifdef HAVE_SYS_FSUID_H setfsgid (getgid ()); setfsgid (getgid ()); -@@ -81,8 +79,6 @@ +@@ -67,7 +65,7 @@ + if (!geteuid ()) + //the process is (ev. SUID) root. I can mlockall() the memory in order to avoid swapping. + { +-#ifdef HAVE_MLOCK ++#ifdef HAVE_MLOCKALL + gint res = mlockall (MCL_CURRENT | MCL_FUTURE); + + if (res) +@@ -82,8 +80,6 @@ #endif //drop root privileges @@ -34,3 +43,21 @@ #ifdef HAVE_SYS_FSUID_H setfsuid (getuid ()); setfsuid (getuid ()); +@@ -243,7 +239,7 @@ + if (!(geteuid () && getegid () && getuid () && getgid ())) + change_sec_level (GRG_UNSAFE); + +-#ifdef HAVE_MLOCK ++#ifdef HAVE_MLOCKALL + if (!mem_safe) + change_sec_level (GRG_UNSAFE); + #endif +@@ -347,7 +343,7 @@ + ADD_INDICATOR (GTK_DIALOG (dialog)->vbox, + _("Memory protection from core dumps"), green) g_free (rl); + +-#ifdef HAVE_MLOCK ++#ifdef HAVE_MLOCKALL + if (mem_safe) + ADD_INDICATOR (GTK_DIALOG (dialog)->vbox, + _("Memory protection from swap writings"), green) diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist index b3c2936d5ac9..08596a02f623 100644 --- a/security/gringotts/pkg-plist +++ b/security/gringotts/pkg-plist @@ -4,5 +4,14 @@ share/locale/de/LC_MESSAGES/gringotts.mo share/locale/fr/LC_MESSAGES/gringotts.mo share/locale/it/LC_MESSAGES/gringotts.mo @unexec rmdir -p %D/share/locale/*/LC_MESSAGES 2>/dev/null || true -%%GNOME:%%share/gnome/apps/Utilities/gringotts.desktop -%%GNOME:%%@unexec rmdir -p %D/share/gnome/apps 2>/dev/null || true +%%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop +%%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true +%%PORTDOCS%%share/doc/gringotts/AUTHORS +%%PORTDOCS%%share/doc/gringotts/BUGS +%%PORTDOCS%%share/doc/gringotts/COPYING +%%PORTDOCS%%share/doc/gringotts/ChangeLog +%%PORTDOCS%%share/doc/gringotts/FAQ +%%PORTDOCS%%share/doc/gringotts/NEWS +%%PORTDOCS%%share/doc/gringotts/README +%%PORTDOCS%%share/doc/gringotts/TODO +%%PORTDOCS%%@dirrm share/doc/gringotts |