fix wrong permissions on /etc (fixes from [3327])

[openwrt.git] / openwrt / package / cups / Makefile

diff --git a/openwrt/package/cups/Makefile b/openwrt/package/cups/Makefile
index 8f75ba1..bb3e9d3 100644 (file)
--- a/openwrt/package/cups/Makefile
+++ b/openwrt/package/cups/Makefile
@@ -71,23 +71,26 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(IPKG_CUPS):
+       rm -rf $(IDIR_CUPS)/etc/cups
        install -d -m0755 $(IDIR_CUPS)/etc/cups
-       cp -fpR $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/
+       $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/
+       rm -rf $(IDIR_CUPS)/etc/cups/certs
+       ln -sf /tmp $(IDIR_CUPS)/etc/cups/certs
        install -d -m0755 $(IDIR_CUPS)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/
        rm -f $(IDIR_CUPS)/usr/bin/cups-config
        install -d -m0755 $(IDIR_CUPS)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/
        install -d -m0755 $(IDIR_CUPS)/usr/share/cups/templates
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/
        install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/
        install -d -m0755 $(IDIR_CUPS)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/
        # overwrite default config with our own
-       cp -fpR ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/
+       $(CP) ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/
        # install initscript with priority 60
        install -d -m0755 $(IDIR_CUPS)/etc/init.d
        install -m0755 ./files/cupsd.init $(IDIR_CUPS)/etc/init.d/S60cupsd
@@ -97,11 +100,11 @@ $(IPKG_CUPS):
 
 $(STAGING_DIR)/usr/lib/libcups.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
 
 install-dev: $(STAGING_DIR)/usr/lib/libcups.so