From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Nov 2009 09:31:11 +0100 Subject: package updates and compile fixes - update ctorrent, cups, gnutls and freeradius-server - compile kerberos (heimdal,krb5) with com_err library from e2fsprogs to allow both to be build without installing local copys of libcom_err - cleanup lynx package add zlib dependency --- package/cups/Makefile | 12 +++++----- package/cups/patches/patch-Makefile | 20 ++++++++++------- package/cups/patches/patch-conf_Makefile | 18 +++++++++++++++ package/cups/patches/patch-configure | 34 ----------------------------- package/cups/patches/patch-ppdc_Makefile | 11 ++++++++++ package/cups/patches/patch-scheduler_auth_c | 11 ---------- 6 files changed, 47 insertions(+), 59 deletions(-) create mode 100644 package/cups/patches/patch-conf_Makefile delete mode 100644 package/cups/patches/patch-configure create mode 100644 package/cups/patches/patch-ppdc_Makefile delete mode 100644 package/cups/patches/patch-scheduler_auth_c (limited to 'package/cups') diff --git a/package/cups/Makefile b/package/cups/Makefile index 778c8fe47..608b043b7 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups -PKG_VERSION:= 1.3.10 +PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 84fffe96b8537c81a463faccead80026 +PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net PKG_DEPENDS:= zlib libpthread @@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=0 \ @@ -40,19 +40,19 @@ CONFIGURE_ARGS+= --with-cups-user=0 \ --disable-cdsassl \ --disable-dbus \ --disable-ssl -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" XAKE_FLAGS+= OPTIM='-fPIC' post-install: - ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners + ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates ${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/ rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile index 663b989b9..70febbf51 100644 --- a/package/cups/patches/patch-Makefile +++ b/package/cups/patches/patch-Makefile @@ -1,12 +1,16 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/Makefile 2009-03-12 22:34:21.000000000 +0100 -+++ cups-1.3.10/Makefile 2009-05-09 22:41:42.000000000 +0200 -@@ -19,7 +19,7 @@ include Makedefs +--- cups-1.4.2.orig/Makefile 2009-07-01 06:01:31.000000000 +0200 ++++ cups-1.4.2/Makefile 2009-11-19 22:04:36.000000000 +0100 +@@ -27,10 +27,10 @@ include Makedefs # Directories to make... # --DIRS = cups backend berkeley cgi-bin filter locale man monitor \ -+DIRS = cups backend berkeley cgi-bin filter locale monitor \ - notifier scheduler systemv test \ +-DIRS = cups filter backend berkeley cgi-bin driver locale man monitor \ +- notifier ppdc scheduler systemv test \ ++DIRS = cups filter backend berkeley cgi-bin driver locale monitor \ ++ notifier ppdc scheduler systemv \ $(PHPDIR) \ - conf data doc $(FONTS) ppd templates +- conf data doc examples $(FONTS) templates ++ conf data examples doc $(FONTS) templates + + + # diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile new file mode 100644 index 000000000..f3ae5c8dd --- /dev/null +++ b/package/cups/patches/patch-conf_Makefile @@ -0,0 +1,18 @@ +--- cups-1.4.2.orig/conf/Makefile 2009-09-22 23:53:31.000000000 +0200 ++++ cups-1.4.2/conf/Makefile 2009-11-19 22:02:20.000000000 +0100 +@@ -72,12 +72,12 @@ install: all install-data install-header + install-data: + for file in $(KEEP); do \ + if test -r $(SERVERROOT)/$$file ; then \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ ++ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ + else \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ ++ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \ + fi ; \ + done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default ++ $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ + if test -r $(DATADIR)/mime/$$file ; then \ diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure deleted file mode 100644 index 82550e632..000000000 --- a/package/cups/patches/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/configure 2009-04-16 22:02:06.000000000 +0200 -+++ cups-1.3.10/configure 2009-05-31 19:41:18.000000000 +0200 -@@ -7460,9 +7460,6 @@ done - - - case $uname in -- Darwin* | *BSD*) -- ARFLAGS="-rcv" -- ;; - *) - ARFLAGS="crvs" - ;; -@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib - ;; - Linux*) - if test -d /usr/lib64; then -- libdir="$exec_prefix/lib64" -+ libdir="$exec_prefix/lib" - fi - ;; - HP-UX*) -@@ -9587,11 +9584,6 @@ _ACEOF - - # Server executables... - case "$uname" in -- *BSD* | Darwin*) -- # *BSD and Darwin (MacOS X) -- INSTALL_SYSV="" -- CUPS_SERVERBIN="$exec_prefix/libexec/cups" -- ;; - *) - # All others - INSTALL_SYSV="install-sysv" diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile new file mode 100644 index 000000000..5cfa1ac9b --- /dev/null +++ b/package/cups/patches/patch-ppdc_Makefile @@ -0,0 +1,11 @@ +--- cups-1.4.2.orig/ppdc/Makefile 2009-05-27 01:27:06.000000000 +0200 ++++ cups-1.4.2/ppdc/Makefile 2009-11-19 21:58:49.000000000 +0100 +@@ -244,7 +244,7 @@ genstrings: genstrings.o libcupsppdc.a + libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + echo Generating localization strings... +- ./genstrings >sample.c ++ #./genstrings >sample.c + + + # diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c deleted file mode 100644 index c1f3a3e94..000000000 --- a/package/cups/patches/patch-scheduler_auth_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100 -+++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200 -@@ -54,6 +54,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include - #ifdef HAVE_SHADOW_H -- cgit v1.2.3 From eb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Dec 2009 19:40:13 +0100 Subject: use pkill for startup scripts - seems to solve the issue, that the same init script get killed otherwise - fine tune dansguardian, squid and iptables package - add default firewall config file (from freewrt) - add an example for transparent proxy via an ethernet bridge --- package/cups/files/cupsd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cups') diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init index 03be3300f..49c37b24f 100644 --- a/package/cups/files/cupsd.init +++ b/package/cups/files/cupsd.init @@ -16,7 +16,7 @@ start) /usr/sbin/cupsd -c /etc/cups/cupsd.conf ;; stop) - killall cupsd + pkill cupsd ;; restart) sh $0 stop -- cgit v1.2.3 From 498aab46151060e0608aaee4801d86dc8c0306de Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 11:57:37 +0100 Subject: fix build on FreeBSD host --- package/cups/patches/patch-configure | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package/cups/patches/patch-configure (limited to 'package/cups') diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure new file mode 100644 index 000000000..8e7e850cd --- /dev/null +++ b/package/cups/patches/patch-configure @@ -0,0 +1,14 @@ +--- cups-1.4.2.orig/configure 2009-11-10 00:04:25.000000000 +0100 ++++ cups-1.4.2/configure 2009-12-11 09:59:57.000000000 +0100 +@@ -10260,11 +10260,6 @@ _ACEOF + + # Server executables... + case "$uname" in +- *BSD* | Darwin*) +- # *BSD and Darwin (MacOS X) +- INSTALL_SYSV="" +- CUPS_SERVERBIN="$exec_prefix/libexec/cups" +- ;; + *) + # All others + INSTALL_SYSV="install-sysv" -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/cups/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/cups') diff --git a/package/cups/Makefile b/package/cups/Makefile index 608b043b7..fc9db155b 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/cups/Config.in | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 package/cups/Config.in (limited to 'package/cups') diff --git a/package/cups/Config.in b/package/cups/Config.in deleted file mode 100644 index 662ff5a84..000000000 --- a/package/cups/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_PACKAGE_CUPS - prompt "cups.............................. Common UNIX Printing System" - tristate - select ADK_PACKAGE_ZLIB - select ADK_PACKAGE_LIBPTHREAD - default n - help - A printer spooling system for devices with USB or LP support - - http://www.cups.org/ -- cgit v1.2.3 From d72530b6ebf2009eb2c9f9c7cb6222c140b711b4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Dec 2009 17:30:11 +0100 Subject: fix make allmodconfig for alix1c-eglibc --- package/cups/patches/patch-scheduler_auth_c | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package/cups/patches/patch-scheduler_auth_c (limited to 'package/cups') diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c new file mode 100644 index 000000000..d9892c206 --- /dev/null +++ b/package/cups/patches/patch-scheduler_auth_c @@ -0,0 +1,10 @@ +--- cups-1.4.2.orig/scheduler/auth.c 2009-05-27 00:01:23.000000000 +0200 ++++ cups-1.4.2/scheduler/auth.c 2009-12-30 12:30:13.000000000 +0100 +@@ -57,6 +57,7 @@ + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include "cupsd.h" + #include + #ifdef HAVE_SHADOW_H -- cgit v1.2.3 From bab1e7d41bff847933589ff6392c74597f18743b Mon Sep 17 00:00:00 2001 From: Joerg Seitter Date: Fri, 8 Jan 2010 13:15:23 +0100 Subject: CUPS patch for build on 64-bit host system changed lib64 into lib Signed-off-by: Joerg Seitter --- package/cups/patches/patch-configure | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'package/cups') diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 8e7e850cd..f23196c67 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,5 +1,16 @@ --- cups-1.4.2.orig/configure 2009-11-10 00:04:25.000000000 +0100 -+++ cups-1.4.2/configure 2009-12-11 09:59:57.000000000 +0100 ++++ cups-1.4.2/configure 2010-01-07 23:11:46.635118361 +0100 +@@ -9850,8 +9850,8 @@ if test "$libdir" = "\${exec_prefix}/lib + libdir="$exec_prefix/lib32" + ;; + Linux*) +- if test -d /usr/lib64; then +- libdir="$exec_prefix/lib64" ++ if test -d /usr/lib; then ++ libdir="$exec_prefix/lib" + fi + ;; + HP-UX*) @@ -10260,11 +10260,6 @@ _ACEOF # Server executables... -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/cups/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/cups') diff --git a/package/cups/Makefile b/package/cups/Makefile index fc9db155b..13ed31d70 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -11,9 +11,9 @@ PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net PKG_DEPENDS:= zlib libpthread +PKG_BUILDDEP+= zlib PKG_URL:= http://www.cups.org -PKG_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \ - ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ +PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 @@ -21,7 +21,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=0 \ @@ -41,8 +40,7 @@ CONFIGURE_ARGS+= --with-cups-user=0 \ --disable-cdsassl \ --disable-dbus \ --disable-ssl -BUILD_STYLE:= auto -INSTALL_STYLE:= auto + FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" XAKE_FLAGS+= OPTIM='-fPIC' @@ -66,8 +64,10 @@ post-install: ${IDIR_CUPS}/usr/share/doc/cups/ rm -f ${IDIR_CUPS}/usr/bin/cups-config ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* ${IDIR_CUPS}/usr/lib/cups/cgi-bin/ - ${CP} ${WRKINST}/usr/lib/cups/daemon/* ${IDIR_CUPS}/usr/lib/cups/daemon/ + ${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* \ + ${IDIR_CUPS}/usr/lib/cups/cgi-bin/ + ${CP} ${WRKINST}/usr/lib/cups/daemon/* \ + ${IDIR_CUPS}/usr/lib/cups/daemon/ ${CP} ${WRKINST}/usr/share/cups/banners/* \ ${IDIR_CUPS}/usr/share/cups/banners/ ${CP} ${WRKINST}/usr/share/cups/templates/*.tmpl \ -- cgit v1.2.3