Changeset 43059fa in freewrt

Timestamp:

Dec 24, 2006, 5:41:34 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

3b7e37e

Parents:

4dbb7c6

Message:

update cups package, sync with branch

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1377 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/cups

Files:

• Config.in (modified) (2 diffs)
• Makefile (modified) (6 diffs)
• files/cupsd.init (modified) (2 diffs)
• ipkg/cups.control (modified) (1 diff)
• patches/100-makefile-targets.patch (deleted)
• patches/110-no-strip-on-install.patch (deleted)
• patches/120-documentation-url.patch (deleted)
• patches/patch-Makefile (added)
• patches/patch-backend_Makefile (added)
• patches/patch-berkeley_Makefile (added)
• patches/patch-cgi-bin_Makefile (added)
• patches/patch-cups_Makefile (added)
• patches/patch-doc_index_html_in (added)
• patches/patch-scheduler_Makefile (added)
• patches/patch-systemv_Makefile (added)

package/cups/Config.in

@@ -3 +3 @@
         tristate
         select FWRT_PACKAGE_ZLIB        
+        select FWRT_PACKAGE_LIBPTHREAD
         default n
         help
@@ -8 +9 @@
           
           http://www.cups.org/
-

package/cups/Makefile

@@ -8 +8 @@
 
 PKG_NAME:=              cups
-PKG_VERSION:=           1.1.23
-PKG_RELEASE:=           2
-PKG_MD5SUM:=            4ce09b1dce09b6b9398af0daae9adf63
+PKG_VERSION:=           1.2.7
+PKG_RELEASE:=           1
+PKG_MD5SUM:=            bf44783d9b46130bee9f2995e6055470
 PKG_INIT:=              60
 
-PKG_SOURCE_URL:=        http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/ftp.easysw.com/pub/cups/$(PKG_VERSION) \
-                        http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \
+PKG_SOURCE_URL:=        http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \
                         ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION)
 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
@@ -25 +24 @@
         (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
-                CFLAGS="$(TARGET_CFLAGS)" \
+                CFLAGS="$(TARGET_CFLAGS) -g" \
                 CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+                LDFLAGS="$(LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+                ac_cv_func_sigset=no \
                 ./configure \
                   --target=$(GNU_TARGET_NAME) \
@@ -75 +75 @@
         install -d -m0755 $(IDIR_CUPS)/etc/cups
         $(CP) $(WRKINST)/etc/cups/* $(IDIR_CUPS)/etc/cups/
-        rm -rf $(IDIR_CUPS)/etc/cups/certs
-        ln -sf /tmp $(IDIR_CUPS)/etc/cups/certs
+        rm $(IDIR_CUPS)/etc/cups/cupsd.conf.default
         install -d -m0755 $(IDIR_CUPS)/usr/bin
         $(CP) $(WRKINST)/usr/bin/* $(IDIR_CUPS)/usr/bin/
+        install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups
+        $(CP) $(WRKINST)/usr/share/doc/cups/index.html \
+                $(IDIR_CUPS)/usr/share/doc/cups/
+        $(CP) $(WRKINST)/usr/share/doc/cups/*.css \
+                $(IDIR_CUPS)/usr/share/doc/cups/
+        $(CP) $(WRKINST)/usr/share/doc/cups/images \
+                $(IDIR_CUPS)/usr/share/doc/cups/
         rm -f $(IDIR_CUPS)/usr/bin/cups-config
+        install -d -m0755 $(IDIR_CUPS)/usr/libexec
+        $(CP) $(WRKINST)/usr/libexec/* $(IDIR_CUPS)/usr/libexec
         install -d -m0755 $(IDIR_CUPS)/usr/lib
         $(CP) $(WRKINST)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/
-        $(CP) $(WRKINST)/usr/lib/cups $(IDIR_CUPS)/usr/lib/
+        install -d -m0755 $(IDIR_CUPS)/usr/share/cups/banners
+        $(CP) $(WRKINST)/usr/share/cups/banners/* $(IDIR_CUPS)/usr/share/cups/banners/
         install -d -m0755 $(IDIR_CUPS)/usr/share/cups/templates
         $(CP) $(WRKINST)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/
-        install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups
-        $(CP) $(WRKINST)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/
-        $(CP) $(WRKINST)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/
         install -d -m0755 $(IDIR_CUPS)/usr/sbin
         $(CP) $(WRKINST)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/
@@ -96 +102 @@
         install -m0755 ./files/cupsd.init \
                 $(IDIR_CUPS)/etc/init.d/S$(PKG_INIT)cupsd
-        find $(IDIR_CUPS) -name CVS | xargs rm -rf
         $(RSTRIP) $(IDIR_CUPS)
         $(IPKG_BUILD) $(IDIR_CUPS) $(PACKAGE_DIR)
@@ -106 +111 @@
         $(CP) $(WRKINST)/usr/include/cups $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(WRKINST)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libcups.so $(STAGING_DIR)/usr/lib/
 
 install-dev: $(STAGING_DIR)/usr/lib/libcups.so
@@ -114 +119 @@
           $(STAGING_DIR)/usr/bin/cups-config \
           $(STAGING_DIR)/usr/include/cups \
-          $(STAGING_DIR)/usr/lib/libcups.{a,so*}
+          $(STAGING_DIR)/usr/lib/libcups.so
 
 compile-targets: install-dev

package/cups/files/cupsd.init

@@ -9 +9 @@
         ;;
 start)
-        [ -d /tmp/cups ] || mkdir -p /tmp/cups
-        [ -d /tmp/spool/cups/tmp ] || mkdir -p /tmp/spool/cups/tmp
-        /usr/sbin/cupsd
+        [ -d /var/cache/cups ] || mkdir -p /var/cache/cups
+        [ -d /var/cups ] || mkdir -p /var/cups/tmp
+        [ -d /var/cups/spool/cups/tmp ] || mkdir -p /var/cups/spool/cups/tmp
+        /usr/sbin/cupsd -c /etc/cups/cupsd.conf
         ;;
 stop)
@@ -24 +25 @@
         ;;
 esac
-exit 0
-
+exit $?

package/cups/ipkg/cups.control

@@ -2 +2 @@
 Priority: optional
 Section: net
-Depends: zlib
+Depends: zlib, libpthread
 Description: Common Unix Printing System