Changeset 20306


Ignore:
Timestamp:
2010-03-19T19:07:45+01:00 (8 years ago)
Author:
florian
Message:

[package] update cups to 1.4.2 (#6597)

Location:
packages/net/cups
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/cups/Makefile

    r19705 r20306  
    99 
    1010PKG_NAME:=cups 
    11 PKG_VERSION:=1.3.10 
     11PKG_VERSION:=1.4.2 
    1212PKG_RELEASE:=1 
    1313 
     
    1717        ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \ 
    1818        ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION) 
    19 PKG_MD5SUM:=84fffe96b8537c81a463faccead80026 
     19PKG_MD5SUM:=d95e2d588e3d36e563027a963b117b1b 
    2020 
    2121PKG_BUILD_DEPENDS:=zlib 
     
    2828  SECTION:=net 
    2929  CATEGORY:=Network 
    30   DEPENDS:=+zlib +libpthread +libpng +libjpeg 
     30  DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp 
    3131  TITLE:=Common UNIX Printing System 
    3232  URL:=http://www.cups.org/ 
     
    5353                --without-php \ 
    5454                --enable-shared \ 
     55                --enable-image \ 
    5556                --disable-dbus \ 
    5657                --disable-pam \ 
     
    8586        rm -f $(1)/usr/bin/cups-config 
    8687        $(INSTALL_DIR) $(1)/usr/lib 
    87         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ 
     88        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ 
    8889        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(1)/usr/lib/ 
    8990        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
    9091        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(1)/usr/share/cups/templates/ 
     92        $(INSTALL_DIR) $(1)/usr/share/cups/mime 
     93        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/ 
    9194        $(INSTALL_DIR) $(1)/usr/share/doc/cups 
    9295        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/ 
     
    111114        $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ 
    112115        $(INSTALL_DIR) $(1)/usr/lib 
    113         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ 
     116        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ 
    114117endef 
    115118 
  • packages/net/cups/files/etc/cups/cupsd.conf

    r15247 r20306  
    3535 
    3636<Location /> 
     37Order Deny,Allow 
     38Allow From 127.0.0.1 
     39Allow From 192.168.1.0/24 
     40</Location> 
     41 
     42<Location /admin> 
    3743AuthType Basic 
    3844AuthClass System 
     
    4046Allow From All 
    4147</Location> 
    42  
    43 <Location /admin> 
    44 AuthType Basic 
    45 AuthClass System 
    46  
    47 Order Allow,Deny 
    48 Allow From All 
    49 </Location> 
    50  
  • packages/net/cups/patches/100-makefile-targets.patch

    r15455 r20306  
    55 # 
    66  
    7 -DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \ 
    8 -               notifier scheduler systemv test \ 
    9 +DIRS   =       cups backend berkeley cgi-bin filter monitor \ 
    10 +               notifier scheduler systemv \ 
     7-DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \ 
     8-               notifier ppdc scheduler systemv test \ 
     9+DIRS   =       cups filter backend berkeley cgi-bin driver monitor \ 
     10+               ppdc scheduler systemv \ 
    1111                $(PHPDIR) \ 
    12                 conf data doc $(FONTS) ppd templates 
     12                conf data doc examples $(FONTS) templates 
    1313  
Note: See TracChangeset for help on using the changeset viewer.