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

Fix SO_PEERCRED fallout.

Browse Source 
from Moritz Grimm.
This commit is contained in:
ajacoutot 2010-07-02 07:52:08 +00:00
parent 207f8b22c3
commit 61d8bcc996
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/cups/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.74 2010/06/27 04:18:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.75 2010/07/02 07:52:08 ajacoutot Exp $
COMMENT= Common Unix Printing System
VERSION= 1.4.4
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}
PKGNAME= cups-${VERSION}p0
CATEGORIES= print sysutils

14
print/cups/patches/patch-config-scripts_cups-common_m4
View File

@ -1,10 +1,18 @@
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.2 2010/06/27 04:18:50 ajacoutot Exp $
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.3 2010/07/02 07:52:08 ajacoutot Exp $
STR #3447: dbus notifier no longer builds
--- config-scripts/cups-common.m4.orig Thu Jun 17 20:25:43 2010
+++ config-scripts/cups-common.m4 Sun Jun 27 06:09:50 2010
@@ -276,6 +276,8 @@ if test "x$enable_dbus" != xno; then
+++ config-scripts/cups-common.m4 Fri Jul 2 09:19:02 2010
@@ -130,7 +130,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
-AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
dnl Checks for string functions.
@@ -276,6 +275,8 @@ if test "x$enable_dbus" != xno; then
dbus_message_iter_init_append,
AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
`$PKGCONFIG --libs dbus-1`)

12
print/cups/patches/patch-scheduler_auth_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scheduler_auth_c,v 1.1 2010/07/02 07:52:08 ajacoutot Exp $
--- scheduler/auth.c.orig Fri Jul 2 09:21:55 2010
+++ scheduler/auth.c Fri Jul 2 09:22:09 2010
@@ -94,7 +94,7 @@ extern const char *cssmErrorString(int error);
typedef struct xucred cupsd_ucred_t;
# define CUPSD_UCRED_UID(c) (c).cr_uid
#else
-typedef struct ucred cupsd_ucred_t;
+typedef struct sockpeercred cupsd_ucred_t;
# define CUPSD_UCRED_UID(c) (c).uid
#endif /* HAVE_SYS_UCRED_H */
#ifdef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID