diff -u cupsys-1.1.23/scheduler/conf.c cupsys-1.1.23/scheduler/conf.c --- cupsys-1.1.23/scheduler/conf.c +++ cupsys-1.1.23/scheduler/conf.c @@ -1627,6 +1627,7 @@ /* Final Listener check. Set default port */ if (NumListeners == 0) { listener_t *temp; /* New listeners array */ + char defvalue[5]; temp = malloc(sizeof(listener_t)); @@ -1642,7 +1643,6 @@ memset(temp, 0, sizeof(listener_t)); - char defvalue[5]; sprintf(defvalue, "%d", IPP_PORT); if (get_address(defvalue, INADDR_ANY, IPP_PORT, &(temp->address))) { diff -u cupsys-1.1.23/debian/changelog cupsys-1.1.23/debian/changelog --- cupsys-1.1.23/debian/changelog +++ cupsys-1.1.23/debian/changelog @@ -1,3 +1,13 @@ +cupsys (1.1.23-2.backports.org.1) unstable; urgency=low + + * recompiled for http://www.backports.org/ + + disabled gnutls support + + built against libtiff3g-dev instead of libtiff4-dev and libpng3-dev instead of + libpng12-dev + + removed debian/patches/20defaultport.patch, looks like it was merged upstream + + -- Norbert Tretkowski Sat, 29 Jan 2005 21:21:35 +0100 + cupsys (1.1.23-3) unstable; urgency=low * Remove $Id$ from config file: 07cvsremovetag.patch (closes: #291629) diff -u cupsys-1.1.23/debian/rules cupsys-1.1.23/debian/rules --- cupsys-1.1.23/debian/rules +++ cupsys-1.1.23/debian/rules @@ -16,7 +16,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl +DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --disable-openssl DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR) #DESTDIR=$(DEB_DESTDIR) BINDIR=$(DEB_DESTDIR)/usr/bin SBINDIR=$(DEB_DESTDIR)/usr/sbin INCLUDEDIR=$(DEB_DESTDIR)/usr/include LIBDIR=$(DEB_DESTDIR)/usr/lib SERVERBIN=$(DEB_DESTDIR)/usr/lib/cups SERVERROOT=$(DEB_DESTDIR)/etc/cups BUILDROOT=$(DEB_DESTDIR) @@ -58,16 +58,16 @@ - ln -s libcupsys2-gnutls10 debian/libcupsimage2/usr/share/doc/libcupsimage2 + ln -s libcupsys2 debian/libcupsimage2/usr/share/doc/libcupsimage2 binary-post-install/libcupsimage2-dev:: rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev - ln -s libcupsys2-gnutls10 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev + ln -s libcupsys2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev binary-post-install/libcupsys2:: rm -r debian/libcupsys2/usr/share/doc/libcupsys2 - ln -s libcupsys2-gnutls10 debian/libcupsys2/usr/share/doc/libcupsys2 + ln -s libcupsys2 debian/libcupsys2/usr/share/doc/libcupsys2 binary-post-install/cupsys-bsd:: rm -r debian/cupsys-bsd/usr/share/doc/cupsys-bsd - ln -s libcupsys2-gnutls10 debian/cupsys-bsd/usr/share/doc/cupsys-bsd + ln -s libcupsys2 debian/cupsys-bsd/usr/share/doc/cupsys-bsd binary-post-install/libcupsys2-dev:: rm -r debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev - ln -s libcupsys2-gnutls10 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev + ln -s libcupsys2 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev binary-post-install/cupsys-client:: rm -r debian/cupsys-client/usr/share/doc/cupsys-client - ln -s libcupsys2-gnutls10 debian/cupsys-client/usr/share/doc/cupsys-client + ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client diff -u cupsys-1.1.23/debian/control cupsys-1.1.23/debian/control --- cupsys-1.1.23/debian/control +++ cupsys-1.1.23/debian/control @@ -3,7 +3,7 @@ Section: net Maintainer: Kenshi Muto Standards-Version: 3.6.1 -Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls11-dev, libpaper-dev, debhelper (>= 4.0), po-debconf, cdbs, sharutils +Build-Depends: libpam0g-dev, libtiff3g-dev, libjpeg62-dev, zlib1g-dev, libpng3-dev, libslp-dev, libpaper-dev, debhelper (>= 4.0), po-debconf, cdbs, sharutils Package: cupsys Priority: optional @@ -47,7 +47,7 @@ Easy Software Products (www.easysw.com), and refer to the original source packages from which these packages are made. -Package: libcupsys2-gnutls10 +Package: libcupsys2 Priority: optional Section: libs Architecture: any @@ -66,28 +66,11 @@ Easy Software Products (www.easysw.com), and refer to the original source packages from which these packages are made. -Package: libcupsys2 -Priority: optional -Section: libs -Architecture: all -Depends: libcupsys2-gnutls10 -Description: Common UNIX Printing System(tm) - dummy libs for transition - The Common UNIX Printing System (or CUPS(tm)) is a printing system and - general replacement for lpd and the like. It supports the Internet - Printing Protocol (IPP), and has its own filtering driver model for - handling various document types. - . - This package is for transition to libcupsys2-gnutls10. - . - The terms "Common UNIX Printing System" and "CUPS" are trademarks of - Easy Software Products (www.easysw.com), and refer to the original - source packages from which these packages are made. - Package: libcupsys2-dev Priority: optional Section: libdevel Architecture: any -Depends: libcupsys2-gnutls10 (= ${Source-Version}), libgnutls11-dev +Depends: libcupsys2 (= ${Source-Version}) Provides: libcupsys-dev Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-2) Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-2) reverted: --- cupsys-1.1.23/debian/patches/20defaultport.patch +++ cupsys-1.1.23.orig/debian/patches/20defaultport.patch @@ -1,42 +0,0 @@ ---- scheduler/conf.c 2003-12-30 22:52:37.000000000 +0900 -+++ scheduler/conf.c 2003-12-30 22:58:49.000000000 +0900 -@@ -1543,6 +1543,39 @@ - } - } - -+ /* Final Listener check. Set default port */ -+ if (NumListeners == 0) { -+ listener_t *temp; /* New listeners array */ -+ char defvalue[5]; -+ -+ temp = malloc(sizeof(listener_t)); -+ -+ if (!temp) -+ { -+ LogMessage(L_ERROR, "Unable to allocate default port - %s.", -+ strerror(errno)); -+ return (0); -+ } -+ -+ Listeners = temp; -+ temp += NumListeners; -+ -+ memset(temp, 0, sizeof(listener_t)); -+ -+ sprintf(defvalue, "%d", IPP_PORT); -+ if (get_address(defvalue, INADDR_ANY, IPP_PORT, &(temp->address))) -+ { -+ LogMessage(L_INFO, "Listening to %x:%d", -+ (unsigned)ntohl(temp->address.sin_addr.s_addr), -+ ntohs(temp->address.sin_port)); -+ NumListeners ++; -+ } -+ else { -+ LogMessage(L_ERROR, "Bad default port."); -+ return (0); -+ } -+ } -+ - return (1); - } - reverted: --- cupsys-1.1.23/debian/libcupsys2-gnutls10.shlibs +++ cupsys-1.1.23.orig/debian/libcupsys2-gnutls10.shlibs @@ -1 +0,0 @@ -libcups 2 libcupsys2-gnutls10 (>= 1.1.23-1) reverted: --- cupsys-1.1.23/debian/libcupsys2-gnutls10.dirs +++ cupsys-1.1.23.orig/debian/libcupsys2-gnutls10.dirs @@ -1 +0,0 @@ -/var/spool/cups/tmp reverted: --- cupsys-1.1.23/debian/libcupsys2-gnutls10.files +++ cupsys-1.1.23.orig/debian/libcupsys2-gnutls10.files @@ -1,2 +0,0 @@ -usr/lib/libcups.so.* -etc/cups/client.conf reverted: --- cupsys-1.1.23/debian/libcupsys2-gnutls10.postinst +++ cupsys-1.1.23.orig/debian/libcupsys2-gnutls10.postinst @@ -1,45 +0,0 @@ -#! /bin/sh -# postinst script for cupsys -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see /usr/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - only in patch2: unchanged: --- cupsys-1.1.23.orig/debian/libcupsys2.dirs +++ cupsys-1.1.23/debian/libcupsys2.dirs @@ -0,0 +1 @@ +/var/spool/cups/tmp only in patch2: unchanged: --- cupsys-1.1.23.orig/debian/libcupsys2.postinst +++ cupsys-1.1.23/debian/libcupsys2.postinst @@ -0,0 +1,45 @@ +#! /bin/sh +# postinst script for cupsys +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + only in patch2: unchanged: --- cupsys-1.1.23.orig/debian/libcupsys2.files +++ cupsys-1.1.23/debian/libcupsys2.files @@ -0,0 +1,2 @@ +usr/lib/libcups.so.* +etc/cups/client.conf only in patch2: unchanged: --- cupsys-1.1.23.orig/debian/libcupsys2.shlibs +++ cupsys-1.1.23/debian/libcupsys2.shlibs @@ -0,0 +1 @@ +libcups 2 libcupsys2 (>= 1.1.23-1)