Hello community,
here is the log from the commit of package cups
checked in at Thu Jul 13 16:07:47 CEST 2006.
--------
--- cups/cups.changes 2006-06-29 17:27:10.000000000 +0200
+++ cups/cups.changes 2006-07-13 14:44:43.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 13 14:44:10 CEST 2006 - kssingvo@suse.de
+
+- moved 3.0 from BETA to STABLE
+
+-------------------------------------------------------------------
@@ -7 +12,6 @@
-Mon Jun 19 15:33:46 CEST 2006 - schwab@suse.de
+Wed Jun 28 11:41:34 CEST 2006 - kssingvo@suse.de
+
+- reinjected lost --datadir into configure
+
+-------------------------------------------------------------------
+Thu Jun 22 14:20:30 CEST 2006 - kssingvo@suse.de
@@ -9 +19,2 @@
-- Set datadir.
+- upgrade to version 1.2.1: a major release after long (>1y) development
+ with new functions, many enhancements, bugfixes and new bugs
Old:
----
cups-1.1.15-libwrap-addition.dif
cups-1.1.19-keepalive.patch
cups-1.1.20-pswrite.patch
cups-1.1.21-xpdf.patch
cups-1.1.21rc2-ppdsdat_generation.patch
cups-1.1.22-md5sum_hide.patch
cups-1.1.23-authorize_glitch.patch
cups-1.1.23-cupstestppd.patch
cups-1.1.23-cupstestppd_pagesize.patch
cups-1.1.23-gcc40.patch
cups-1.1.23-lib_segfault.patch
cups-1.1.23-libpng.patch
cups-1.1.23-locale.patch
cups-1.1.23-lppasswd.patch
cups-1.1.23-lpstat_strftime.patch
cups-1.1.23-pie.patch
cups-1.1.23-printcap_info.patch
cups-1.1.23-source.tar.bz2
cups-1.1.23-usb_descr.patch
cups-1.1.23-xpdf2.patch
cups-1.1.23-xpdf3.patch
cups-access-conf.diff
cups-mime.patch
patch-template.dif
New:
----
cups-1.2.0-ppdsdat_generation.patch
cups-1.2.1-source.tar.bz2
cups-1.2b2-access_conf.patch
cups-1.2b2-locale.patch
cups-1.2rc1-template.patch
cups-1.2rc3-libwrap.patch
cups-1.2rc3-mime.patch
cups-1.2rc3-pswrite.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.igBX4r/_old 2006-07-13 16:07:06.000000000 +0200
+++ /var/tmp/diff_new_pack.igBX4r/_new 2006-07-13 16:07:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cups (Version 1.1.23)
+# spec file for package cups (Version 1.2.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: cups
-BuildRequires: gcc-c++ libpng-devel libtiff-devel openslp-devel openssl-devel pam-devel tcpd-devel
+BuildRequires: gcc-c++ libpng-devel libtiff-devel openslp-devel openssl-devel pam-devel tcpd-devel update-desktop-files
URL: http://www.cups.org/
License: GPL, Other License(s), see package
Group: Hardware/Printing
Summary: The Common UNIX Printing System
-Version: 1.1.23
-Release: 42
+Version: 1.2.1
+Release: 3
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux, /usr/bin/ionice
@@ -37,34 +37,18 @@
Source15: PSLEVEL1.PPD.bz2
Source16: PSLEVEL2.PPD.bz2
Source17: rccupsrenice
-Patch1: cups-mime.patch
-Patch2: cups-1.1.21rc2-ppdsdat_generation.patch
-Patch3: patch-template.dif
-Patch4: cups-1.1.15-libwrap-addition.dif
+Patch1: cups-1.2rc3-mime.patch
+Patch2: cups-1.2.0-ppdsdat_generation.patch
+Patch3: cups-1.2rc1-template.patch
+Patch4: cups-1.2rc3-libwrap.patch
Patch5: cups-pam.diff
-Patch6: cups-access-conf.diff
-Patch7: cups-1.1.23-locale.patch
-Patch8: cups-1.1.19-keepalive.patch
+Patch6: cups-1.2b2-access_conf.patch
+Patch7: cups-1.2b2-locale.patch
Patch9: cups-1.1.21rc2-preauth_security.patch
Patch10: cups-1.1.21rc2-usermode.patch
-Patch11: cups-1.1.22-md5sum_hide.patch
-Patch12: cups-1.1.20-pswrite.patch
+Patch12: cups-1.2rc3-pswrite.patch
Patch13: cups-1.1.21-umlaut_printer.patch
Patch14: cups-1.1.21-testppd_duplex.patch
-Patch15: cups-1.1.21-xpdf.patch
-Patch16: cups-1.1.23-xpdf2.patch
-Patch17: cups-1.1.23-lib_segfault.patch
-Patch18: cups-1.1.23-authorize_glitch.patch
-Patch19: cups-1.1.23-lppasswd.patch
-Patch20: cups-1.1.23-cupstestppd_pagesize.patch
-Patch21: cups-1.1.23-gcc40.patch
-Patch22: cups-1.1.23-pie.patch
-Patch23: cups-1.1.23-lpstat_strftime.patch
-Patch24: cups-1.1.23-cupstestppd.patch
-Patch25: cups-1.1.23-printcap_info.patch
-Patch26: cups-1.1.23-xpdf3.patch
-Patch27: cups-1.1.23-usb_descr.patch
-Patch28: cups-1.1.23-libpng.patch
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version >= 801
@@ -145,32 +129,16 @@
%setup -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p0 -E
+%patch3 -p1
%patch4 -p1
%patch5
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+#tbd: %patch9 -p1
+#tbd: %patch10 -p1
%patch12 -p1
-%patch13 -p1
+#tbd: %patch13 -p1
%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28
if [ -f /.buildenv ]; then
. /.buildenv
else
@@ -178,15 +146,23 @@
fi
perl -pi -e "s|SUSEVERSION|$BUILD_DISTRIBUTION_NAME|; \
s/CUPSVERSION/%{version}/" %{PATCH100}
-%patch100 -p1
+#tbd: %patch100 -p1
+# fix hardcoded $_libdir path to real architecture dependend $_libdir
+perl -pi -e 's|(CUPS_SERVERBIN=\")\$exec_prefix/lib|$1'%{_libdir}'|' \
+ config-scripts/cups-directories.m4
%build
%{?suse_update_config:%{suse_update_config -f . }}
libtoolize --force
aclocal
autoconf
+%if %suse_version >= 1010
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -O2 -fno-strict-aliasing -fstack-protector"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
+%else
+export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -O2 -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%endif
export CXX=g++
./configure \
--mandir=%{_mandir} \
@@ -196,37 +172,22 @@
--with-docdir=%{_defaultdocdir}/%{name} \
--with-cups-user=lp \
--with-cups-group=lp \
+ --enable-pie \
+ --enable-static \
+ --without-rcdir \
--prefix=/
-perl -pi -e 's:^(OPTIONS\s+\=):$1 -I/usr/X11R6/include -O2 -fstack-protector -fno-strict-aliasing:' Makedefs
-perl -pi -e 's:^(INSTALL_BIN\s+\=.*)-s:$1:' Makedefs
+# perl -pi -e 's:^(OPTIONS\s+\=):$1 -I/usr/X11R6/include -O2 -fstack-protector -fno-strict-aliasing:' Makedefs
+# perl -pi -e 's:^(INSTALL_BIN\s+\=.*)-s:$1:' Makedefs
# for debugging enable:
#perl -pi -e 's:^(OPTIONS\s+\=):$1 -I/usr/X11R6/include -O2 -fno-strict-aliasing -g -DDEBUG:' Makedefs
#perl -pi -e 's:^(OPTIM\s+\=):$1 -g -DDEBUG:' Makedefs
make CXX=g++
# Compile additional tools
-gcc -opoll_ppd_base $RPM_OPT_FLAGS -fstack-protector -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE1}
-gcc -olphelp $RPM_OPT_FLAGS -fstack-protector -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE2}
+gcc -opoll_ppd_base $CFLAGS -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE1}
+gcc -olphelp $CFLAGS -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE2}
%install
-make prefix=$RPM_BUILD_ROOT \
- exec_prefix=$RPM_BUILD_ROOT/usr \
- BINDIR=$RPM_BUILD_ROOT/usr/bin \
- DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
- DOCDIR=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} \
- INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
- LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
- LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
- LOGDIR=$RPM_BUILD_ROOT/var/log/cups \
- MANDIR=$RPM_BUILD_ROOT/usr/share/man \
- AMANDIR=$RPM_BUILD_ROOT/usr/share/man \
- MAN8EXT=8 \
- PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
- REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
- SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
- SERVERBIN=$RPM_BUILD_ROOT%{_libdir}/cups \
- SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
- INITDIR="" \
- INITDDIR="" \
+make BUILDROOT=$RPM_BUILD_ROOT \
install
if [ x%{version} = x"1.1.18" ]; then
mv $RPM_BUILD_ROOT/usr/sbin/cupstestppd \
@@ -236,9 +197,8 @@
%{INSTALL_SCRIPT} %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/cups/filter
%{INSTALL_SCRIPT} %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/cups/filter
%{INSTALL_SCRIPT} %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/cups/filter
-install -m 0644 conf/printcap $RPM_BUILD_ROOT/etc/cups
-ln -s /etc/cups/printcap $RPM_BUILD_ROOT/etc
-# install the two litte tools
+# might no longer be needed: ln -s /etc/cups/printcap $RPM_BUILD_ROOT/etc
+# install the two little tools
install -m 755 poll_ppd_base $RPM_BUILD_ROOT/usr/bin/
install -m 755 lphelp $RPM_BUILD_ROOT/usr/bin/
%{INSTALL_DIR} $RPM_BUILD_ROOT/etc/init.d
@@ -267,7 +227,7 @@
%{INSTALL_DIR} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
install -m 644 -D conf/pam.suse $RPM_BUILD_ROOT/etc/pam.d/cups
install -m 755 $RPM_SOURCE_DIR/PrintAnalyzer $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
-for f in CGI.txt CREDITS.txt ENCRYPTION.txt LICENSE.txt LICENSE.html README.txt README_fr.txt; do
+for f in CHANGES*.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt; do
install -m 644 "$f" $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
done
bzip2 -cd < %{SOURCE12} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript.ppd
@@ -284,6 +244,12 @@
"$FILE"
gzip -9 "$FILE"
done
+# add files for menu
+rm -f $RPM_BUILD_ROOT//usr/share/applications/cups.desktop
+%suse_update_desktop_file -i -r %name PrintingUtility
+mkdir $RPM_BUILD_ROOT/usr/share/pixmaps
+install -m 644 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/cups.png $RPM_BUILD_ROOT/usr/share/pixmaps
+rm -rf $RPM_BUILD_ROOT/usr/share/icons
# remove unpackaged files
rm -rf $RPM_BUILD_ROOT/%{_mandir}/es/cat?
rm -rf $RPM_BUILD_ROOT/%{_mandir}/fr/cat?
@@ -300,7 +266,7 @@
%post
%{fillup_and_insserv -npy cups cups}
-%{fillup_and_insserv -npY cups cupsrenice}
+%{fillup_and_insserv -npy cups cupsrenice}
%preun
%stop_on_removal cups
@@ -311,19 +277,21 @@
%files
%defattr(-,root,root)
-%dir %attr(711,lp,lp) %{_sysconfdir}/cups/certs
+%dir %attr(711,lp,lp) %{_sysconfdir}/cups/ssl
%dir %attr(755,lp,lp) %{_sysconfdir}/cups/ppd
-%dir %attr(700,lp,lp) %{_sysconfdir}/cups/ssl
-%config(noreplace) %attr(640,lp,lp) %{_sysconfdir}/cups/classes.conf
%config(noreplace) %attr(640,lp,lp) %{_sysconfdir}/cups/cupsd.conf
+%{_sysconfdir}/cups/cupsd.conf.default
%config(noreplace) %attr(755,lp,lp) %{_sysconfdir}/cups/interfaces
%config(noreplace) %{_sysconfdir}/cups/mime.*
-%config(noreplace) %attr(640,lp,lp) %{_sysconfdir}/cups/printers.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
-%verify(not md5 size mtime) %config(missingok,noreplace) %{_sysconfdir}/cups/printcap
-%verify(not md5 size mtime) %config(missingok,noreplace) %{_sysconfdir}/printcap
+# %dir %attr(700,lp,lp) %{_sysconfdir}/cups/cerst
+# %config(noreplace) %attr(640,lp,lp) %{_sysconfdir}/cups/classes.conf
+# %config(noreplace) %attr(640,lp,lp) %{_sysconfdir}/cups/printers.conf
+# %verify(not md5 size mtime) %config(missingok,noreplace) %{_sysconfdir}/cups/printcap
+# %verify(not md5 size mtime) %config(missingok,noreplace) %{_sysconfdir}/printcap
%{_bindir}/poll_ppd_base
%{_bindir}/cupstestppd
+%{_bindir}/cupstestdsc
%dir %{_libdir}/cups
%dir %{_libdir}/cups/backend
%{_libdir}/cups/backend/http
@@ -331,6 +299,7 @@
%{_libdir}/cups/backend/lpd
%{_libdir}/cups/backend/parallel
%{_libdir}/cups/backend/scsi
+%{_libdir}/cups/backend/snmp
%{_libdir}/cups/backend/serial
%{_libdir}/cups/backend/socket
%{_libdir}/cups/backend/usb
@@ -338,11 +307,18 @@
%{_libdir}/cups/daemon
%dir %{_libdir}/cups/filter
%{_libdir}/cups/filter/[abd-z]*
+%dir %{_libdir}/cups/monitor
+%{_libdir}/cups/monitor/*
+%dir %{_libdir}/cups/notifier
+%{_libdir}/cups/notifier/*
+%{_libdir}/cups/monitor/*
%{_sbindir}/cupsaddsmb
%{_sbindir}/cupsd
%{_sbindir}/rc*
%dir %attr(0775,root,ntadmin) /usr/share/cups/drivers
%dir /usr/share/cups
+/usr/share/applications/cups.desktop
+/usr/share/pixmaps/cups.png
/usr/share/cups/[bcf-t]*
/usr/share/cups/d[ao]*
%config %attr(0755,root,root) /etc/init.d/cups
@@ -351,26 +327,8 @@
/var/adm/fillup-templates/sysconfig.cups
%doc %{_defaultdocdir}/%{name}
%doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/cupsaddsmb*
-%doc %{_mandir}/man8/cups-lpd*
-%doc %{_mandir}/man8/cups-polld*
-%doc %{_mandir}/man8/cupsd*
-%dir %{_mandir}/es
-%dir %{_mandir}/es/man5
-%dir %{_mandir}/es/man8
-%doc %{_mandir}/es/man5/*
-%doc %{_mandir}/es/man8/cupsaddsmb*
-%doc %{_mandir}/es/man8/cups-lpd*
-%doc %{_mandir}/es/man8/cups-polld*
-%doc %{_mandir}/es/man8/cupsd*
-%dir %{_mandir}/fr
-%dir %{_mandir}/fr/man5
-%dir %{_mandir}/fr/man8
-%doc %{_mandir}/fr/man5/*
-%doc %{_mandir}/fr/man8/cupsaddsmb*
-%doc %{_mandir}/fr/man8/cups-lpd*
-%doc %{_mandir}/fr/man8/cups-polld*
-%doc %{_mandir}/fr/man8/cupsd*
+%doc %{_mandir}/man7/*
+%doc %{_mandir}/man8/*
%files client
%defattr(-,root,root)
@@ -384,25 +342,11 @@
%{_bindir}/lprm
%{_bindir}/lpstat
%{_bindir}/cancel
-%{_bindir}/*able
+%{_sbindir}/*able
%{_sbindir}/accept
%{_sbindir}/lp*
%{_sbindir}/reject
-%dir %{_datadir}/locale/C
-%{_datadir}/locale/*/cups_*
%doc %{_mandir}/man1/[a-eg-z]*
-%doc %{_mandir}/man1/filter*
-%dir %{_mandir}/fr
-%dir %{_mandir}/fr/man1
-%dir %{_mandir}/fr/man8
-%doc %{_mandir}/fr/man1/*
-%doc %{_mandir}/man8/[ad-r]*
-%doc %{_mandir}/fr/man8/[ad-r]*
-%dir %{_mandir}/es
-%dir %{_mandir}/es/man1
-%dir %{_mandir}/es/man8
-%doc %{_mandir}/es/man1/*
-%doc %{_mandir}/es/man8/[ad-r]*
%files devel
%defattr(-,root,root)
@@ -417,15 +361,21 @@
%dir %attr(0710,lp,lp) %{_var}/spool/cups
%dir %attr(1770,lp,lp) %{_var}/spool/cups/tmp
%dir %attr(0755,lp,lp) %{_var}/log/cups/
-%config(noreplace) %{_sysconfdir}/cups/client.conf
+# %config(noreplace) %{_sysconfdir}/cups/client.conf
%{_libdir}/libcups.so*
%{_libdir}/libcupsimage.so*
+%{_datadir}/locale/*/cups_*
%changelog -n cups
+* Thu Jul 13 2006 - kssingvo@suse.de
+- moved 3.0 from BETA to STABLE
* Thu Jun 29 2006 - nadvornik@suse.cz
- do not use deprecated libpng function png_read_destroy
-* Mon Jun 19 2006 - schwab@suse.de
-- Set datadir.
+* Wed Jun 28 2006 - kssingvo@suse.de
+- reinjected lost --datadir into configure
+* Thu Jun 22 2006 - kssingvo@suse.de
+- upgrade to version 1.2.1: a major release after long (>1y) development
+ with new functions, many enhancements, bugfixes and new bugs
* Mon May 22 2006 - kssingvo@suse.de
- removed Required-Start: in rccupsrenice; real fix for (bugzilla#172708)
* Mon May 22 2006 - lmuelle@suse.de
++++++ cups-1.1.21rc2-ppdsdat_generation.patch -> cups-1.2.0-ppdsdat_generation.patch ++++++
--- cups/cups-1.1.21rc2-ppdsdat_generation.patch 2004-09-02 18:35:16.000000000 +0200
+++ cups/cups-1.2.0-ppdsdat_generation.patch 2006-05-10 16:06:51.000000000 +0200
@@ -1,6 +1,6 @@
---- cups-1.1.21rc2/scheduler/main.c.orig 2004-08-23 20:36:50.000000000 +0200
-+++ cups-1.1.21rc2/scheduler/main.c 2004-08-31 14:26:48.847650117 +0200
-@@ -120,6 +121,7 @@
+--- cups-1.2.0/scheduler/main.c.orig 2006-03-18 04:05:12.000000000 +0100
++++ cups-1.2.0/scheduler/main.c 2006-03-29 19:02:22.000000000 +0200
+@@ -148,6 +148,7 @@
*/
fg = 0;
@@ -8,25 +8,26 @@
for (i = 1; i < argc; i ++)
if (argv[i][0] == '-')
-@@ -161,6 +163,10 @@
- fg = -1;
+@@ -219,6 +220,10 @@
+ #endif /* HAVE_LAUNCHD */
break;
-+ case 'p' : /* generate ppds only */
++ case 'P' : /* generate ppds only */
+ ppds_generation = 1;
+ break;
+
default : /* Unknown option */
- fprintf(stderr, "cupsd: Unknown option \'%c\' - aborting!\n", *opt);
- usage();
-@@ -227,16 +227,17 @@
+ _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
+ "aborting!\n"), *opt);
+@@ -287,17 +292,18 @@
perror("cupsd");
return (1);
}
- else if (WIFEXITED(i))
+ else if (!ppds_generation && WIFEXITED(i))
{
- fprintf(stderr, "cupsd: Child exited with status %d!\n", WEXITSTATUS(i));
+ fprintf(stderr, "cupsd: Child exited with status %d!\n",
+ WEXITSTATUS(i));
return (2);
}
- else
@@ -40,7 +41,7 @@
}
}
-@@ -403,6 +400,9 @@
+@@ -482,6 +488,9 @@
}
#endif /* __sgi */
@@ -50,35 +51,43 @@
/*
* Initialize authentication certificates...
*/
-@@ -1302,7 +1311,7 @@
- static void
- usage(void)
+@@ -2260,13 +2269,14 @@
+ usage(int status) /* O - Exit status */
{
-- fputs("Usage: cupsd [-c config-file] [-f] [-F]\n", stderr);
-+ fputs("Usage: cupsd [-c config-file] [-f] [-F] [-p]\n", stderr);
- exit(1);
+ _cupsLangPuts(status ? stderr : stdout,
+- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
++ _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [-P]\n"
+ "\n"
+ "-c config-file Load alternate configuration file\n"
+ "-f Run in the foreground\n"
+ "-F Run in the foreground but detach\n"
+ "-h Show this usage message\n"
+- "-l Run cupsd from launchd(8)\n"));
++ "-l Run cupsd from launchd(8)\n"
++ "-P Generate ppds.dat and exit\n"));
+ exit(status);
}
---- cups-1.1.21rc2/scheduler/cupsd.h.orig 2004-08-23 20:00:59.000000000 +0200
-+++ cups-1.1.21rc2/scheduler/cupsd.h 2004-09-02 17:55:34.159083379 +0200
-@@ -190,6 +190,8 @@
- *PPDs VALUE(NULL);
- /* Available PPDs */
+--- cups-1.2.0/scheduler/cupsd.h.orig 2006-03-18 04:05:12.000000000 +0100
++++ cups-1.2.0/scheduler/cupsd.h 2006-03-29 17:30:47.000000000 +0200
+@@ -202,6 +202,8 @@
+ char *envp[], int infd, int outfd,
+ int errfd, int backfd, int root, int *pid);
+VAR int ppds_generation;/* Generate ppds.dat and exit() */
+
/*
- * Prototypes...
---- cups-1.1.21rc2/scheduler/conf.c.orig 2004-08-23 20:00:59.000000000 +0200
-+++ cups-1.1.21rc2/scheduler/conf.c 2004-09-02 17:58:43.489227340 +0200
-@@ -709,6 +709,9 @@
- ClearString(&old_serverroot);
- ClearString(&old_requestroot);
+ * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $".
+--- cups-1.2.0/scheduler/conf.c.orig 2006-03-14 12:54:45.000000000 +0100
++++ cups-1.2.0/scheduler/conf.c 2006-03-29 17:30:47.000000000 +0200
+@@ -716,6 +716,9 @@
+ TempDir, strerror(errno));
+ }
+ if (ppds_generation > 0)
+ return(1);
+
/*
- * Startup the server and return...
+ * Setup environment variables...
*/
++++++ cups-1.1.23-source.tar.bz2 -> cups-1.2.1-source.tar.bz2 ++++++
cups/cups-1.1.23-source.tar.bz2 cups/cups-1.2.1-source.tar.bz2 differ: char 11, line 1
++++++ cups-1.2b2-access_conf.patch ++++++
--- cups-1.2b2/conf/cupsd.conf.in.orig 2006-02-16 13:28:29.000000000 +0100
+++ cups-1.2b2/conf/cupsd.conf.in 2006-03-14 21:10:37.000000000 +0100
@@ -29,6 +29,7 @@
<Location />
Order allow,deny
Allow localhost
+ Allow 127.0.0.2
</Location>
# Restrict access to the admin pages...
++++++ cups-1.2b2-locale.patch ++++++
--- cups-1.2b2/cups/language.c.orig 2006-03-08 03:29:48.000000000 +0100
+++ cups-1.2b2/cups/language.c 2006-03-14 21:18:01.000000000 +0100
@@ -50,8 +50,10 @@
#include "globals.h"
#include "debug.h"
+#include