diff -u cupsys-1.2.1/debian/rules cupsys-1.2.1/debian/rules --- cupsys-1.2.1/debian/rules +++ cupsys-1.2.1/debian/rules @@ -42,6 +42,7 @@ -rm config.log config.h config.cache config.status Makedefs cups.sh -rmdir --ignore-fail-on-non-empty debian/patched -rm -f doc/es/index.html doc/ja/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man man/cupsd.conf.man man/lpoptions.man templates/ja/header.tmpl templates/es/header.tmpl templates/header.tmpl init/cups.sh init/cups-lpd + -rm backend/*.o common-install-prehook-impl:: (cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR)) diff -u cupsys-1.2.1/debian/changelog cupsys-1.2.1/debian/changelog --- cupsys-1.2.1/debian/changelog +++ cupsys-1.2.1/debian/changelog @@ -1,3 +1,14 @@ +cupsys (1.2.1-0ubuntu2) dapper-updates; urgency=low + + * Add debian/patches/00_r5660.dpatch + - Fix for 11.22.33.* network masks (STR #1769), Closes: LP#52390 + * Fixed debian/patches/05_avoidunknowngroup + - Don't create .rej files + * Fixed debian/rules + - Delete backend/*.o on clean + + -- Ante Karamatic Sun, 9 Jul 2006 08:05:12 +0200 + cupsys (1.2.1-0ubuntu1) dapper-updates; urgency=low * Upgrade to new upstream version 1.2.1 (backported from edgy): diff -u cupsys-1.2.1/debian/patches/05_avoidunknowngroup.dpatch cupsys-1.2.1/debian/patches/05_avoidunknowngroup.dpatch --- cupsys-1.2.1/debian/patches/05_avoidunknowngroup.dpatch +++ cupsys-1.2.1/debian/patches/05_avoidunknowngroup.dpatch @@ -20,21 +19,0 @@ -diff -urNad cupsys-1.2.1~/systemv/Makefile.rej cupsys-1.2.1/systemv/Makefile.rej ---- cupsys-1.2.1~/systemv/Makefile.rej 1970-01-01 00:00:00.000000000 +0000 -+++ cupsys-1.2.1/systemv/Makefile.rej 2006-07-06 16:48:58.000000000 +0000 -@@ -0,0 +1,17 @@ -+*************** -+*** 77,83 **** -+ $(INSTALL_BIN) lp $(BINDIR) -+ $(INSTALL_BIN) lpoptions $(BINDIR) -+ $(INSTALL_BIN) lpstat $(BINDIR) -+- $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR) -+ -+ -+ # -+--- 77,83 ---- -+ $(INSTALL_BIN) lp $(BINDIR) -+ $(INSTALL_BIN) lpoptions $(BINDIR) -+ $(INSTALL_BIN) lpstat $(BINDIR) -++ $(INSTALL_BIN) -m 4755 -o lp -g root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR) -+ -+ -+ # diff -u cupsys-1.2.1/debian/patches/00list cupsys-1.2.1/debian/patches/00list --- cupsys-1.2.1/debian/patches/00list +++ cupsys-1.2.1/debian/patches/00list @@ -1,4 +1,5 @@ 00_r5643.dpatch +00_r5660.dpatch 02_configure.dpatch #03_manext.dpatch 03_clean.dpatch only in patch2: unchanged: --- cupsys-1.2.1.orig/debian/patches/00_r5660.dpatch +++ cupsys-1.2.1/debian/patches/00_r5660.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00_r5660.dpatch by Ante Karamatic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- cupsys-1.2.1~/scheduler/conf.c 2006-07-09 08:21:04.000000000 +0000 ++++ cupsys-1.2.1/scheduler/conf.c 2006-07-09 08:35:25.000000000 +0000 +@@ -1356,12 +1356,34 @@ + * Parse dotted-decimal IPv4 address... + */ + ++ unsigned val[4]; /* IPv4 address values */ ++ ++ + family = AF_INET; +- ipcount = sscanf(value, "%u.%u.%u.%u", ip + 0, ip + 1, ip + 2, ip + 3); ++ ipcount = sscanf(value, "%u.%u.%u.%u", val + 0, val + 1, val + 2, val + 3); + +- ip[3] |= ((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8; +- ip[0] = ip[1] = ip[2] = 0; ++ /* ++ * Range check the IP numbers... ++ */ + ++ for (i = 0; i < ipcount; i ++) ++ if (val[i] > 255) ++ return (0); ++ ++ /* ++ * Make sure the trailing values are zeroed, as some C libraries like ++ * glibc apparently like to fill the unused arguments with garbage... ++ */ ++ ++ for (i = ipcount; i < 4; i ++) ++ val[i] = 0; ++ ++ /* ++ * Merge everything into a 32-bit IPv4 address in ip[3]... ++ */ ++ ++ ip[3] = (((((val[0] << 8) | val[1]) << 8) | val[2]) << 8) | val[3]; ++ + if (ipcount < 4) + mask[3] = (0xffffffff << (32 - 8 * ipcount)) & 0xffffffff; + }