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

chmod -h 0644 /etc/printcap to please security(8).

Browse Source 
prodded by schwarze@

While here, drop the converters/libiconv MODULE.
This commit is contained in:
ajacoutot 2016-04-12 06:45:36 +00:00
parent e8a17ca9c3
commit 9eb2915bc9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/cups/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.208 2016/03/11 20:28:30 naddy Exp $
# $OpenBSD: Makefile,v 1.209 2016/04/12 06:45:36 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
@ -10,6 +10,9 @@ EXTRACT_SUFX= .tar.bz2
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-main= 0
REVISION-libs= 0
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4
@ -26,9 +29,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2 - LGPLv2
PERMIT_PACKAGE_CDROM= Yes
MODULES= converters/libiconv
WANTLIB += avahi-client avahi-common gnutls m pthread stdc++ z
WANTLIB += avahi-client avahi-common gnutls iconv m pthread stdc++ z
WANTLIB-main += ${WANTLIB}
WANTLIB-main += c cups cupscgi cupsimage cupsmime cupsppdc dbus-1 usb-1.0

4
print/cups/pkg/cupsd.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: cupsd.rc,v 1.23 2015/07/12 08:56:50 ajacoutot Exp $
# $OpenBSD: cupsd.rc,v 1.24 2016/04/12 06:45:36 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/cupsd"
@ -36,9 +36,11 @@ rc_pre() {
if [ ! -e /etc/printcap.pre-cups ]; then
mv /etc/printcap /etc/printcap.pre-cups
ln -s ${SYSCONFDIR}/cups/printcap /etc/printcap
chmod -h 0644 /etc/printcap
fi
else
ln -s ${SYSCONFDIR}/cups/printcap /etc/printcap
chmod -h 0644 /etc/printcap
fi
for i in lpq lpr lprm; do
rm -f /usr/bin/$i