diff options
| author | hans <hans@pkgsrc.org> | 2011-10-13 13:05:57 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-10-13 13:05:57 +0000 |
| commit | ae83241f9a0f17f3d90203fc3d862e07ad334948 (patch) | |
| tree | ba308555f40c82cbad4d13829356200402442323 /print | |
| parent | 53f683758ade31c5fce18b962d42988289221365 (diff) | |
| download | pkgsrc-ae83241f9a0f17f3d90203fc3d862e07ad334948.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-config-scripts_cups-gssapi.m4 | 19 | ||||
| -rw-r--r-- | print/cups/patches/patch-scheduler_dirsvc.c | 13 |
3 files changed, 35 insertions, 1 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index 6344d3701fd..fc0c1626c34 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.83 2011/10/04 14:11:14 hans Exp $ +$NetBSD: distinfo,v 1.84 2011/10/13 13:05:57 hans Exp $ SHA1 (cups-1.4.8-source.tar.bz2) = 9167f556e78e0bc075f1eb2f695d79cc1f334007 RMD160 (cups-1.4.8-source.tar.bz2) = ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 @@ -20,4 +20,6 @@ SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 SHA1 (patch-ap) = 70c5fa4a19ca2812818844180ca9db9cb7cfd601 SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622 SHA1 (patch-au) = e4e976ccb4d7782e31f5b0e3ed175359bf95ba42 +SHA1 (patch-config-scripts_cups-gssapi.m4) = a027a1c5a444c3ef39f892f2592fbbb16586087b SHA1 (patch-filter_image-gif.c) = 2269cbf7e42ec80ba91c27eda4871884775f4b7a +SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups/patches/patch-config-scripts_cups-gssapi.m4 new file mode 100644 index 00000000000..d9a681e5f42 --- /dev/null +++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4 @@ -0,0 +1,19 @@ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2011/10/13 13:05:57 hans Exp $ + +--- config-scripts/cups-gssapi.m4.orig 2009-05-19 00:03:04.000000000 +0200 ++++ config-scripts/cups-gssapi.m4 2011-09-20 18:57:15.406259164 +0200 +@@ -29,14 +29,6 @@ if test x$enable_gssapi != xno; then + # Mac OS X weak-links to the Kerberos framework... + LIBGSSAPI="-weak_framework Kerberos" + ;; +- SunOS*) +- # Solaris has a non-standard krb5-config, don't use it! +- AC_CHECK_LIB(gss, gss_display_status, +- AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) +- CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" +- CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" +- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`") +- ;; + *) + # Other platforms just ask for GSSAPI + CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups/patches/patch-scheduler_dirsvc.c new file mode 100644 index 00000000000..e8aab235d62 --- /dev/null +++ b/print/cups/patches/patch-scheduler_dirsvc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2011/10/13 13:05:57 hans Exp $ + +--- scheduler/dirsvc.c.orig 2011-01-22 01:07:22.000000000 +0100 ++++ scheduler/dirsvc.c 2011-09-20 19:08:50.512786064 +0200 +@@ -1332,7 +1332,7 @@ ldap_connect(void) + cupsdLogMessage(CUPSD_LOG_ERROR, "LDAP bind failed with error %d: %s", + rc, ldap_err2string(rc)); + +-# if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP) ++# if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP) && !defined(__sun) + if (ldap_ssl && (rc == LDAP_SERVER_DOWN || rc == LDAP_CONNECT_ERROR)) + { + ssl_err = PORT_GetError(); |