Attachment #102269 for bug #142043

View | Details | Raw Unified | Return to bug 142043
Collapse All | Expand All




#

PORTNAME=	gringotts
PORTVERSION=	1.2.10
PORTREVISION=	7
CATEGORIES=	security
MASTER_SITES=	BERLIOS
		ftp://ftp.nuug.no/pub/anders/distfiles/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	GTK application to securely store sensitive data

LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
		gringotts.2:${PORTSDIR}/security/libgringotts

USE_BZIP2=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	gtk20
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.if ${HAVE_GNOME:Mgnomehier}!=""
USE_GNOME+=	gnomehier
PLIST_SUB+=	GNOMEHIER=''
.else
PLIST_SUB+=	GNOMEHIER='@comment '
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/^install-data-am:/s|install-DsktpDATA|| ; \
		 /^install-data-am:/s|install-docDATA|| ; \
		 s|@md5sum|@md5|' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		'/^install-exec-am:/s|install-exec-local||' ${WRKSRC}/src/Makefile.in

post-install:
	@${MKDIR} ${PREFIX}/share/applications
	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in AUTHORS BUGS ChangeLog FAQ NEWS README TODO
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)security/gringotts/distinfo (-3 / +3 lines)
1	MD5 (gringotts-1.2.8.tar.bz2) = f84add2aadca642a354105f63c117dec	1	MD5 (gringotts-1.2.10.tar.gz) = 6f17589f1cb7d08be73728843dcf286a
2	SHA256 (gringotts-1.2.8.tar.bz2) = cc4640cf57f0dc31799a6a4db44b9d9a06ee08be14f1c565512db28d3ae8d6f0	2	SHA256 (gringotts-1.2.10.tar.gz) = 19784f68f76b211d076124c74d2f5ca5a156e4af7ed32d72a1ba45547782179d
3	SIZE (gringotts-1.2.8.tar.bz2) = 174175	3	SIZE (gringotts-1.2.10.tar.gz) = 251963




--- src/grg_safe.c.orig	2008-01-04 22:08:43.000000000 +0900
+++ src/grg_safe.c	2009-12-22 04:53:36.000000000 +0900
@@ -33,6 +33,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <errno.h>
 #include <regex.h>
 #include <unistd.h>
@@ -44,7 +45,6 @@
@@ -43,7 +44,6 @@
 #include <sys/fsuid.h>
 #endif
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/resource.h>
 #ifdef linux
 #include <sys/utsname.h>
@@ -96,9 +96,6 @@
 grg_mlockall_and_drop_root_privileges(void)
 {
     /* drop eventual group root privileges */
-    setgid(getgid());
-    setgid(getgid());		/* twice for counter "saved IDs", cfr. */
-				/* Secure Programming HowTo */
 #ifdef HAVE_SYS_FSUID_H
     setfsgid(getgid());
     setfsgid(getgid());
@@ -148,8 +145,6 @@
 #endif
 
 	/* drop root privileges */
-	setuid(getuid());
-	setuid(getuid());
 #ifdef HAVE_SYS_FSUID_H

Lines 1-11 Link Here

(-)security/gringotts/files/patch-po-Makefile.in.in (-11 lines)
1	--- po/Makefile.in.in.orig Wed May 14 02:32:06 2003
2	+++ po/Makefile.in.in Wed May 14 02:32:22 2003
3	@@ -106,7 +106,7 @@
4	@catalogs='$(CATALOGS)'; \
5	for cat in $$catalogs; do \
6	cat=`basename $$cat`; \
7	- lang=`echo $$cat \| sed 's/\.gmo$$//'`; \
8	+ lang=`echo $$cat \| sed 's/\.mo$$//'`; \
9	dir=$(localedir)/$$lang/LC_MESSAGES; \
10	$(mkinstalldirs) $(DESTDIR)$$dir; \
11	if test -r $$cat; then \

Lines 1-10 Link Here

(-)security/gringotts/files/patch-src-Makefile.in (-10 lines)
1	--- src/Makefile.in.orig Tue Feb 18 22:06:05 2003
2	+++ src/Makefile.in Tue Feb 18 22:06:33 2003
3	@@ -399,7 +399,6 @@
4
5	install-exec-local:
6	strip $(DESTDIR)$(bindir)/gringotts
7	- chmod u+s $(DESTDIR)$(bindir)/gringotts
8	# Tell versions [3.59,3.63) of GNU make to not export all variables.
9	# Otherwise a system limit (for SysV at least) may be exceeded.
10	.NOEXPORT:




bin/gringotts
share/applications/gringotts.desktop
share/locale/de/LC_MESSAGES/gringotts.mo
share/locale/fr/LC_MESSAGES/gringotts.mo
share/locale/it/LC_MESSAGES/gringotts.mo
%%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
%%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/locale/de/LC_MESSAGES/gringotts.mo
share/locale/fr/LC_MESSAGES/gringotts.mo
share/locale/it/LC_MESSAGES/gringotts.mo
share/locale/pl/LC_MESSAGES/gringotts.mo
share/locale/ru/LC_MESSAGES/gringotts.mo
share/pixmaps/gringotts.xpm
share/pixmaps/gringotts-32.xpm
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications

Return to bug 142043

Lines 6-49 Link Here

(-)security/gringotts/Makefile (-30 / +25 lines)
6	#	6	#
7		7
8	PORTNAME= gringotts	8	PORTNAME= gringotts
9	PORTVERSION= 1.2.8	9	PORTVERSION= 1.2.10
10	PORTREVISION= 7
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= BERLIOS \	11	MASTER_SITES= BERLIOS
13	ftp://ftp.nuug.no/pub/anders/distfiles/
14		12
15	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
16	COMMENT= GTK application to securely store sensitive data	14	COMMENT= GTK application to securely store sensitive data
17		15
18	LIB_DEPENDS= gringotts.2:${PORTSDIR}/security/libgringotts \	16	LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
19	popt.0:${PORTSDIR}/devel/popt	17	gringotts.2:${PORTSDIR}/security/libgringotts
20		18
21	USE_BZIP2= yes
22	GNU_CONFIGURE= yes
23	USE_GNOME= gtk20	19	USE_GNOME= gtk20
24	WANT_GNOME= yes	20	GNU_CONFIGURE= yes
25	CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"	21	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
26	CONFIGURE_ARGS+= --disable-env-check	22
27		23	CPPFLAGS= -I${LOCALBASE}/include
28	.include <bsd.port.pre.mk>	24	LDFLAGS= -L${LOCALBASE}/lib
29
30	.if ${HAVE_GNOME:Mgnomehier}!=""
31	USE_GNOME+= gnomehier
32	PLIST_SUB+= GNOMEHIER=''
33	.else
34	PLIST_SUB+= GNOMEHIER='@comment '
35	.endif
36		25
37	post-patch:	26	post-patch:
38	${REINPLACE_CMD} -E -e "s\|^(gringottsdocdir =).*\|\1 ${DOCSDIR}\|;s\|md5sum\|md5\|g" ${WRKSRC}/Makefile.in	27	@${REINPLACE_CMD} -e \
39	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \	28	'/^install-data-am:/s\|install-DsktpDATA\|\| ; \
40	's\|-D.*_DISABLE_DEPRECATED\|\|g'	29	/^install-data-am:/s\|install-docDATA\|\| ; \
41	.if defined(NOPORTDOCS)	30	s\|@md5sum\|@md5\|' ${WRKSRC}/Makefile.in
42	${REINPLACE_CMD} -E -e "s\|^(install-data-am:.*)install-gringottsdocDATA\|\1\|" ${WRKSRC}/Makefile.in	31	@${REINPLACE_CMD} -e \
43	.endif	32	'/^install-exec-am:/s\|install-exec-local\|\|' ${WRKSRC}/src/Makefile.in
44	.if ${HAVE_GNOME:Mgnomehier}==""	33
45	${REINPLACE_CMD} -E -e "s\|^(install-data-am:.*)install-DsktpDATA\|\1\|" \	34	post-install:
46	${WRKSRC}/Makefile.in	35	@${MKDIR} ${PREFIX}/share/applications
		36	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications
		37	.if !defined(NOPORTDOCS)
		38	@${MKDIR} ${DOCSDIR}
		39	.for file in AUTHORS BUGS ChangeLog FAQ NEWS README TODO
		40	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		41	.endfor
47	.endif	42	.endif
48		43
49	.include <bsd.port.post.mk>	44	.include <bsd.port.mk>

Lines 1-34 Link Here

(-)security/gringotts/files/patch-grg_safe.c (-12 / +13 lines)
1	--- src/grg_safe.c.orig Wed May 14 02:02:13 2003	1	--- src/grg_safe.c.orig 2008-01-04 22:08:43.000000000 +0900
2	+++ src/grg_safe.c Wed May 14 02:03:43 2003	2	+++ src/grg_safe.c 2009-12-22 04:53:36.000000000 +0900
3	@@ -33,6 +33,7 @@	3	@@ -33,6 +33,7 @@
4		4
5	#include <stdlib.h>	5	#include <stdlib.h>
6	#include <string.h>	6	#include <string.h>
7	+#include <sys/types.h>	7	+#include <sys/types.h>
		8	#include <errno.h>
8	#include <regex.h>	9	#include <regex.h>
9	#include <unistd.h>	10	#include <unistd.h>
10	#include <fcntl.h>	11	@@ -44,7 +45,6 @@
11	@@ -43,7 +44,6 @@
12	#include <sys/fsuid.h>	12	#include <sys/fsuid.h>
13	#endif	13	#endif
14	#include <sys/time.h>	14	#include <sys/time.h>
15	-#include <sys/types.h>	15	-#include <sys/types.h>
16	#include <sys/resource.h>	16	#include <sys/resource.h>
17	#include <sys/stat.h>	17	#ifdef linux
18		18	#include <sys/utsname.h>
19	@@ -59,8 +59,6 @@	19	@@ -96,9 +96,6 @@
20	grg_mlockall_and_drop_root_privileges(void)	20	grg_mlockall_and_drop_root_privileges(void)
21	{	21	{
22	// drop eventual group root privileges	22	/* drop eventual group root privileges */
23	- setgid(getgid());	23	- setgid(getgid());
24	- setgid(getgid()); // twice for counter "saved IDs", cfr.	24	- setgid(getgid()); /* twice for counter "saved IDs", cfr. */
25	// Secure Programming HowTo	25	- /* Secure Programming HowTo */
26	#ifdef HAVE_SYS_FSUID_H	26	#ifdef HAVE_SYS_FSUID_H
27	setfsgid(getgid());	27	setfsgid(getgid());
28	@@ -84,8 +82,6 @@	28	setfsgid(getgid());
		29	@@ -148,8 +145,6 @@
29	#endif	30	#endif
30		31
31	// drop root privileges	32	/* drop root privileges */
32	- setuid(getuid());	33	- setuid(getuid());
33	- setuid(getuid());	34	- setuid(getuid());
34	#ifdef HAVE_SYS_FSUID_H	35	#ifdef HAVE_SYS_FSUID_H

Lines 1-16 Link Here

(-)security/gringotts/pkg-plist (-7 / +9 lines)
1	bin/gringotts	1	bin/gringotts
2	share/pixmaps/gringotts.xpm	2	share/applications/gringotts.desktop
3	share/locale/de/LC_MESSAGES/gringotts.mo
4	share/locale/fr/LC_MESSAGES/gringotts.mo
5	share/locale/it/LC_MESSAGES/gringotts.mo
6	%%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
7	%%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null \|\| true
8	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
9	%%PORTDOCS%%%%DOCSDIR%%/BUGS	4	%%PORTDOCS%%%%DOCSDIR%%/BUGS
10	%%PORTDOCS%%%%DOCSDIR%%/COPYING
11	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	5	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
12	%%PORTDOCS%%%%DOCSDIR%%/FAQ	6	%%PORTDOCS%%%%DOCSDIR%%/FAQ
13	%%PORTDOCS%%%%DOCSDIR%%/NEWS	7	%%PORTDOCS%%%%DOCSDIR%%/NEWS
14	%%PORTDOCS%%%%DOCSDIR%%/README	8	%%PORTDOCS%%%%DOCSDIR%%/README
15	%%PORTDOCS%%%%DOCSDIR%%/TODO	9	%%PORTDOCS%%%%DOCSDIR%%/TODO
		10	share/locale/de/LC_MESSAGES/gringotts.mo
		11	share/locale/fr/LC_MESSAGES/gringotts.mo
		12	share/locale/it/LC_MESSAGES/gringotts.mo
		13	share/locale/pl/LC_MESSAGES/gringotts.mo
		14	share/locale/ru/LC_MESSAGES/gringotts.mo
		15	share/pixmaps/gringotts.xpm
		16	share/pixmaps/gringotts-32.xpm
16	%%PORTDOCS%%@dirrm %%DOCSDIR%%	17	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		18	@dirrmtry share/applications