Fri Jun 19 08:20:43 2015 UTC ()
Remove group permissions from cgi-bin directory.
pgoyette reported:
E [17/Jun/2015:07:12:52 +0800] Directory "/usr/pkg/libexec/cups/cgi-bin" has
insecure permissions (040775/uid=0/gid=0).

While here, remove --enable-openssl since the configure script does
not recognize it any longer.
Bump PKGREVISION.


(wiz)
diff -r1.220 -r1.221 pkgsrc/print/cups/Makefile
cvs diff -r1.220 -r1.221 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2015/06/12 11:02:35 1.220
+++ pkgsrc/print/cups/Makefile 2015/06/19 08:20:43 1.221
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.220 2015/06/12 11:02:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.221 2015/06/19 08:20:43 wiz Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
 9PKGREVISION= 1
9BASE_VERS= 2.0.3 10BASE_VERS= 2.0.3
10DIST_VERS= ${BASE_VERS} 11DIST_VERS= ${BASE_VERS}
11CATEGORIES= print 12CATEGORIES= print
12MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ 13MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/
13EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
14 15
15MAINTAINER= sbd@NetBSD.org 16MAINTAINER= sbd@NetBSD.org
16HOMEPAGE= http://www.cups.org/ 17HOMEPAGE= http://www.cups.org/
17COMMENT= Common UNIX Printing System 18COMMENT= Common UNIX Printing System
18LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 19LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
19 20
20CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 21CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
21 22
@@ -29,27 +30,26 @@ USE_LIBTOOL= yes @@ -29,27 +30,26 @@ USE_LIBTOOL= yes
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 31CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
32CONFIGURE_ARGS+= --localstatedir=${VARBASE} 33CONFIGURE_ARGS+= --localstatedir=${VARBASE}
33CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 34CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
34CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 35CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
35CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 36CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
36CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 37CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
37CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 38CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
38CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 39CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
39CONFIGURE_ARGS+= --enable-libpaper 40CONFIGURE_ARGS+= --enable-libpaper
40CONFIGURE_ARGS+= --enable-libtool 41CONFIGURE_ARGS+= --enable-libtool
41CONFIGURE_ARGS+= --enable-ssl 42CONFIGURE_ARGS+= --enable-ssl
42CONFIGURE_ARGS+= --enable-openssl 
43CONFIGURE_ARGS+= --with-manext=bsd 43CONFIGURE_ARGS+= --with-manext=bsd
44CONFIGURE_ARGS+= --without-icondir 44CONFIGURE_ARGS+= --without-icondir
45CONFIGURE_ARGS+= --without-menudir 45CONFIGURE_ARGS+= --without-menudir
46CONFIGURE_ARGS+= --without-perl 46CONFIGURE_ARGS+= --without-perl
47CONFIGURE_ARGS+= --without-php 47CONFIGURE_ARGS+= --without-php
48CONFIGURE_ARGS+= --without-python 48CONFIGURE_ARGS+= --without-python
49CONFIGURE_ARGS+= --without-java 49CONFIGURE_ARGS+= --without-java
50CONFIGURE_ARGS+= --disable-gssapi 50CONFIGURE_ARGS+= --disable-gssapi
51CONFIGURE_ARGS+= --disable-gnutls 51CONFIGURE_ARGS+= --disable-gnutls
52 52
53CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 53CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
54 54
55.include "../../mk/bsd.prefs.mk" 55.include "../../mk/bsd.prefs.mk"
@@ -155,26 +155,27 @@ pre-configure: @@ -155,26 +155,27 @@ pre-configure:
155 155
156post-extract: 156post-extract:
157 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 157 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
158 158
159post-install: 159post-install:
160 set -e; for file in LICENSE.txt README.txt; do \ 160 set -e; for file in LICENSE.txt README.txt; do \
161 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 161 ${INSTALL_DATA} ${WRKSRC}/$${file} \
162 ${DESTDIR}${DOCDIR}/$${file}; \ 162 ${DESTDIR}${DOCDIR}/$${file}; \
163 done 163 done
164 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \ 164 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \
165 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ 165 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \
166 ${DESTDIR}${EGDIR}/$${file}; \ 166 ${DESTDIR}${EGDIR}/$${file}; \
167 done 167 done
 168 ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin
168.if !empty(PKG_OPTIONS:Mpam) 169.if !empty(PKG_OPTIONS:Mpam)
169 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 170 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
170.endif 171.endif
171.if !empty(PKG_OPTIONS:Mdnssd) 172.if !empty(PKG_OPTIONS:Mdnssd)
172 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns 173 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
173.endif 174.endif
174 175
175.include "../../converters/libiconv/buildlink3.mk" 176.include "../../converters/libiconv/buildlink3.mk"
176.include "../../devel/zlib/buildlink3.mk" 177.include "../../devel/zlib/buildlink3.mk"
177.include "../../graphics/png/buildlink3.mk" 178.include "../../graphics/png/buildlink3.mk"
178.include "../../graphics/tiff/buildlink3.mk" 179.include "../../graphics/tiff/buildlink3.mk"
179.include "../../mk/jpeg.buildlink3.mk" 180.include "../../mk/jpeg.buildlink3.mk"
180.include "../../mk/pthread.buildlink3.mk" 181.include "../../mk/pthread.buildlink3.mk"