From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 70c926e75bc83d60490d5c1ce9d8d62ed64d284b
Date: Thu, 27 Mar 2014 15:08:49 +0100 [thread overview]
Message-ID: <20140327140849.96B3320758@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 28210 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 70c926e75bc83d60490d5c1ce9d8d62ed64d284b (commit)
via a3f2459f8fb71a49935902f167de08bbd8b85fd3 (commit)
via 1e4b7130e1e0a05ae5c939122d6f88708bbf8531 (commit)
via 38ca33d110b4516f927e866a37db59e596f4b6a4 (commit)
from 90b0389a90b58695a05e419e9098b96cac66e003 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 70c926e75bc83d60490d5c1ce9d8d62ed64d284b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 27 15:08:17 2014 +0100
firewall: Create mangle chain NAT_DESTINATION to silence error messages when updating.
commit a3f2459f8fb71a49935902f167de08bbd8b85fd3
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Mar 27 11:58:48 2014 +0100
Firewall: fix Update from core 75 to 76
commit 1e4b7130e1e0a05ae5c939122d6f88708bbf8531
Merge: 38ca33d 90b0389
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 27 15:07:26 2014 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 38ca33d110b4516f927e866a37db59e596f4b6a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 27 11:36:12 2014 +0100
cups: Fix rootfile.
Basically, include just everything.
-----------------------------------------------------------------------
Summary of changes:
config/firewall/convert-outgoingfw | 5 +
config/rootfiles/common/configroot | 1 +
config/rootfiles/core/76/filelists/firewall | 1 +
config/rootfiles/core/76/update.sh | 5 +
config/rootfiles/packages/cups | 444 ++++++++++++++--------------
lfs/configroot | 1 +
lfs/cups | 2 +-
7 files changed, 236 insertions(+), 223 deletions(-)
Difference in files:
diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index ea49375..2f9b74c 100755
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -78,6 +78,11 @@ else
if (! -s "$outfwsettings") {
print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
+ #Fill the firewall settings file
+ open (SETTINGS, ">/var/ipfire/firewall/settings");
+ print SETTINGS "POLICY=MODE2\n";
+ print SETTINGS "POLICY1=MODE2\n";
+ close (SETTINGS);
exit(0);
}
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index f509370..b5de989 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -63,6 +63,7 @@ var/ipfire/fwhosts
#var/ipfire/fwhosts/customnetworks
#var/ipfire/fwhosts/customservicegrp
#var/ipfire/fwhosts/customservices
+#var/ipfire/fwhosts/customservices.default
#var/ipfire/fwhosts/icmp-types
var/ipfire/fwlogs
#var/ipfire/fwlogs/ipsettings
diff --git a/config/rootfiles/core/76/filelists/firewall b/config/rootfiles/core/76/filelists/firewall
index e770307..6eeaeae 100644
--- a/config/rootfiles/core/76/filelists/firewall
+++ b/config/rootfiles/core/76/filelists/firewall
@@ -11,3 +11,4 @@ usr/sbin/firewall-policy
var/ipfire/firewall/p2protocols
var/ipfire/fwhosts/icmp-types
var/ipfire/menu.d/50-firewall.menu
+var/ipfire/fwhosts/customservices.default
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index a9055d3..038adcf 100644
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -279,6 +279,7 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
/sbin/iptables -N POLICYOUT 2>/dev/null
/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
+/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null
# Create config files for firewall and fix permissions.
touch /var/ipfire/firewall/config
@@ -291,6 +292,10 @@ touch /var/ipfire/fwhosts/customgroups
touch /var/ipfire/fwhosts/customservices
touch /var/ipfire/fwhosts/customservicegrp
+if [ ! -s "/var/ipfire/fwhosts/customservices" ];then
+ cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices
+fi
+
# Fix ownership.
chown -R nobody:nobody /var/ipfire/firewall
chown -R nobody:nobody /var/ipfire/fwhosts
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 7693e15..3acbcac 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -49,8 +49,8 @@ usr/bin/ppdpo
#usr/include/cups/sidechannel.h
#usr/include/cups/transcode.h
#usr/include/cups/versioning.h
-#usr/lib/cups
-#usr/lib/cups/backend
+usr/lib/cups
+usr/lib/cups/backend
usr/lib/cups/backend/http
usr/lib/cups/backend/https
usr/lib/cups/backend/ipp
@@ -60,19 +60,19 @@ usr/lib/cups/backend/smb
usr/lib/cups/backend/snmp
usr/lib/cups/backend/socket
usr/lib/cups/backend/usb
-#usr/lib/cups/cgi-bin
+usr/lib/cups/cgi-bin
usr/lib/cups/cgi-bin/admin.cgi
usr/lib/cups/cgi-bin/classes.cgi
usr/lib/cups/cgi-bin/help.cgi
usr/lib/cups/cgi-bin/jobs.cgi
usr/lib/cups/cgi-bin/printers.cgi
-#usr/lib/cups/daemon
+usr/lib/cups/daemon
usr/lib/cups/daemon/cups-deviced
usr/lib/cups/daemon/cups-driverd
usr/lib/cups/daemon/cups-exec
usr/lib/cups/daemon/cups-lpd
usr/lib/cups/driver
-#usr/lib/cups/filter
+usr/lib/cups/filter
usr/lib/cups/filter/commandtops
usr/lib/cups/filter/gziptoany
usr/lib/cups/filter/pstops
@@ -81,21 +81,21 @@ usr/lib/cups/filter/rastertoepson
usr/lib/cups/filter/rastertohp
usr/lib/cups/filter/rastertolabel
usr/lib/cups/filter/rastertopwg
-#usr/lib/cups/monitor
+usr/lib/cups/monitor
usr/lib/cups/monitor/bcp
usr/lib/cups/monitor/tbcp
-#usr/lib/cups/notifier
+usr/lib/cups/notifier
usr/lib/cups/notifier/mailto
usr/lib/cups/notifier/rss
-usr/lib/libcups.so
+#usr/lib/libcups.so
usr/lib/libcups.so.2
-usr/lib/libcupscgi.so
+#usr/lib/libcupscgi.so
usr/lib/libcupscgi.so.1
-usr/lib/libcupsimage.so
+#usr/lib/libcupsimage.so
usr/lib/libcupsimage.so.2
-usr/lib/libcupsmime.so
+#usr/lib/libcupsmime.so
usr/lib/libcupsmime.so.1
-usr/lib/libcupsppdc.so
+#usr/lib/libcupsppdc.so
usr/lib/libcupsppdc.so.1
usr/sbin/accept
usr/sbin/cupsaccept
@@ -111,19 +111,19 @@ usr/sbin/lpc
usr/sbin/lpinfo
usr/sbin/lpmove
usr/sbin/reject
-#usr/share/cups
-#usr/share/cups/banners
+usr/share/cups
+usr/share/cups/banners
usr/share/cups/banners/classified
usr/share/cups/banners/confidential
usr/share/cups/banners/secret
usr/share/cups/banners/standard
usr/share/cups/banners/topsecret
usr/share/cups/banners/unclassified
-#usr/share/cups/data
+usr/share/cups/data
usr/share/cups/data/testprint
-#usr/share/cups/drv
+usr/share/cups/drv
usr/share/cups/drv/sample.drv
-#usr/share/cups/examples
+usr/share/cups/examples
usr/share/cups/examples/color.drv
usr/share/cups/examples/constraint.drv
usr/share/cups/examples/custom.drv
@@ -135,7 +135,7 @@ usr/share/cups/examples/postscript.drv
usr/share/cups/examples/r300-basic.drv
usr/share/cups/examples/r300-colorman.drv
usr/share/cups/examples/r300-remote.drv
-#usr/share/cups/ipptool
+usr/share/cups/ipptool
usr/share/cups/ipptool/color.jpg
usr/share/cups/ipptool/create-printer-subscription.test
usr/share/cups/ipptool/document-a4.pdf
@@ -166,19 +166,19 @@ usr/share/cups/ipptool/testfile.pdf
usr/share/cups/ipptool/testfile.ps
usr/share/cups/ipptool/testfile.txt
usr/share/cups/ipptool/validate-job.test
-#usr/share/cups/mime
+usr/share/cups/mime
usr/share/cups/mime/mime.convs
usr/share/cups/mime/mime.types
-#usr/share/cups/model
-#usr/share/cups/ppdc
-#usr/share/cups/ppdc/epson.h
+usr/share/cups/model
+usr/share/cups/ppdc
+usr/share/cups/ppdc/epson.h
usr/share/cups/ppdc/font.defs
-#usr/share/cups/ppdc/hp.h
-#usr/share/cups/ppdc/label.h
+usr/share/cups/ppdc/hp.h
+usr/share/cups/ppdc/label.h
usr/share/cups/ppdc/media.defs
usr/share/cups/ppdc/raster.defs
usr/share/cups/profiles
-#usr/share/cups/templates
+usr/share/cups/templates
usr/share/cups/templates/add-class.tmpl
usr/share/cups/templates/add-printer.tmpl
usr/share/cups/templates/add-rss-subscription.tmpl
@@ -559,77 +559,77 @@ usr/share/cups/templates/it/subscription-canceled.tmpl
usr/share/cups/templates/it/test-page.tmpl
usr/share/cups/templates/it/trailer.tmpl
usr/share/cups/templates/it/users.tmpl
-#usr/share/cups/templates/ja
-#usr/share/cups/templates/ja/add-class.tmpl
-#usr/share/cups/templates/ja/add-printer.tmpl
-#usr/share/cups/templates/ja/add-rss-subscription.tmpl
-#usr/share/cups/templates/ja/admin.tmpl
-#usr/share/cups/templates/ja/choose-device.tmpl
-#usr/share/cups/templates/ja/choose-make.tmpl
-#usr/share/cups/templates/ja/choose-model.tmpl
-#usr/share/cups/templates/ja/choose-serial.tmpl
-#usr/share/cups/templates/ja/choose-uri.tmpl
-#usr/share/cups/templates/ja/class-added.tmpl
-#usr/share/cups/templates/ja/class-confirm.tmpl
-#usr/share/cups/templates/ja/class-deleted.tmpl
-#usr/share/cups/templates/ja/class-jobs-header.tmpl
-#usr/share/cups/templates/ja/class-modified.tmpl
-#usr/share/cups/templates/ja/class.tmpl
-#usr/share/cups/templates/ja/classes-header.tmpl
-#usr/share/cups/templates/ja/classes.tmpl
-#usr/share/cups/templates/ja/command.tmpl
-#usr/share/cups/templates/ja/edit-config.tmpl
-#usr/share/cups/templates/ja/error-op.tmpl
-#usr/share/cups/templates/ja/error.tmpl
-#usr/share/cups/templates/ja/header.tmpl
-#usr/share/cups/templates/ja/help-header.tmpl
-#usr/share/cups/templates/ja/help-printable.tmpl
-#usr/share/cups/templates/ja/help-trailer.tmpl
-#usr/share/cups/templates/ja/job-cancel.tmpl
-#usr/share/cups/templates/ja/job-hold.tmpl
-#usr/share/cups/templates/ja/job-move.tmpl
-#usr/share/cups/templates/ja/job-moved.tmpl
-#usr/share/cups/templates/ja/job-release.tmpl
-#usr/share/cups/templates/ja/job-restart.tmpl
-#usr/share/cups/templates/ja/jobs-header.tmpl
-#usr/share/cups/templates/ja/jobs.tmpl
-#usr/share/cups/templates/ja/list-available-printers.tmpl
-#usr/share/cups/templates/ja/modify-class.tmpl
-#usr/share/cups/templates/ja/modify-printer.tmpl
-#usr/share/cups/templates/ja/norestart.tmpl
-#usr/share/cups/templates/ja/option-boolean.tmpl
-#usr/share/cups/templates/ja/option-conflict.tmpl
-#usr/share/cups/templates/ja/option-header.tmpl
-#usr/share/cups/templates/ja/option-pickmany.tmpl
-#usr/share/cups/templates/ja/option-pickone.tmpl
-#usr/share/cups/templates/ja/option-trailer.tmpl
-#usr/share/cups/templates/ja/pager.tmpl
-#usr/share/cups/templates/ja/printer-accept.tmpl
-#usr/share/cups/templates/ja/printer-added.tmpl
-#usr/share/cups/templates/ja/printer-configured.tmpl
-#usr/share/cups/templates/ja/printer-confirm.tmpl
-#usr/share/cups/templates/ja/printer-default.tmpl
-#usr/share/cups/templates/ja/printer-deleted.tmpl
-#usr/share/cups/templates/ja/printer-jobs-header.tmpl
-#usr/share/cups/templates/ja/printer-modified.tmpl
-#usr/share/cups/templates/ja/printer-purge.tmpl
-#usr/share/cups/templates/ja/printer-reject.tmpl
-#usr/share/cups/templates/ja/printer-start.tmpl
-#usr/share/cups/templates/ja/printer-stop.tmpl
-#usr/share/cups/templates/ja/printer.tmpl
-#usr/share/cups/templates/ja/printers-header.tmpl
-#usr/share/cups/templates/ja/printers.tmpl
-#usr/share/cups/templates/ja/restart.tmpl
-#usr/share/cups/templates/ja/samba-export.tmpl
-#usr/share/cups/templates/ja/samba-exported.tmpl
-#usr/share/cups/templates/ja/search.tmpl
-#usr/share/cups/templates/ja/set-printer-options-header.tmpl
-#usr/share/cups/templates/ja/set-printer-options-trailer.tmpl
-#usr/share/cups/templates/ja/subscription-added.tmpl
-#usr/share/cups/templates/ja/subscription-canceled.tmpl
-#usr/share/cups/templates/ja/test-page.tmpl
-#usr/share/cups/templates/ja/trailer.tmpl
-#usr/share/cups/templates/ja/users.tmpl
+usr/share/cups/templates/ja
+usr/share/cups/templates/ja/add-class.tmpl
+usr/share/cups/templates/ja/add-printer.tmpl
+usr/share/cups/templates/ja/add-rss-subscription.tmpl
+usr/share/cups/templates/ja/admin.tmpl
+usr/share/cups/templates/ja/choose-device.tmpl
+usr/share/cups/templates/ja/choose-make.tmpl
+usr/share/cups/templates/ja/choose-model.tmpl
+usr/share/cups/templates/ja/choose-serial.tmpl
+usr/share/cups/templates/ja/choose-uri.tmpl
+usr/share/cups/templates/ja/class-added.tmpl
+usr/share/cups/templates/ja/class-confirm.tmpl
+usr/share/cups/templates/ja/class-deleted.tmpl
+usr/share/cups/templates/ja/class-jobs-header.tmpl
+usr/share/cups/templates/ja/class-modified.tmpl
+usr/share/cups/templates/ja/class.tmpl
+usr/share/cups/templates/ja/classes-header.tmpl
+usr/share/cups/templates/ja/classes.tmpl
+usr/share/cups/templates/ja/command.tmpl
+usr/share/cups/templates/ja/edit-config.tmpl
+usr/share/cups/templates/ja/error-op.tmpl
+usr/share/cups/templates/ja/error.tmpl
+usr/share/cups/templates/ja/header.tmpl
+usr/share/cups/templates/ja/help-header.tmpl
+usr/share/cups/templates/ja/help-printable.tmpl
+usr/share/cups/templates/ja/help-trailer.tmpl
+usr/share/cups/templates/ja/job-cancel.tmpl
+usr/share/cups/templates/ja/job-hold.tmpl
+usr/share/cups/templates/ja/job-move.tmpl
+usr/share/cups/templates/ja/job-moved.tmpl
+usr/share/cups/templates/ja/job-release.tmpl
+usr/share/cups/templates/ja/job-restart.tmpl
+usr/share/cups/templates/ja/jobs-header.tmpl
+usr/share/cups/templates/ja/jobs.tmpl
+usr/share/cups/templates/ja/list-available-printers.tmpl
+usr/share/cups/templates/ja/modify-class.tmpl
+usr/share/cups/templates/ja/modify-printer.tmpl
+usr/share/cups/templates/ja/norestart.tmpl
+usr/share/cups/templates/ja/option-boolean.tmpl
+usr/share/cups/templates/ja/option-conflict.tmpl
+usr/share/cups/templates/ja/option-header.tmpl
+usr/share/cups/templates/ja/option-pickmany.tmpl
+usr/share/cups/templates/ja/option-pickone.tmpl
+usr/share/cups/templates/ja/option-trailer.tmpl
+usr/share/cups/templates/ja/pager.tmpl
+usr/share/cups/templates/ja/printer-accept.tmpl
+usr/share/cups/templates/ja/printer-added.tmpl
+usr/share/cups/templates/ja/printer-configured.tmpl
+usr/share/cups/templates/ja/printer-confirm.tmpl
+usr/share/cups/templates/ja/printer-default.tmpl
+usr/share/cups/templates/ja/printer-deleted.tmpl
+usr/share/cups/templates/ja/printer-jobs-header.tmpl
+usr/share/cups/templates/ja/printer-modified.tmpl
+usr/share/cups/templates/ja/printer-purge.tmpl
+usr/share/cups/templates/ja/printer-reject.tmpl
+usr/share/cups/templates/ja/printer-start.tmpl
+usr/share/cups/templates/ja/printer-stop.tmpl
+usr/share/cups/templates/ja/printer.tmpl
+usr/share/cups/templates/ja/printers-header.tmpl
+usr/share/cups/templates/ja/printers.tmpl
+usr/share/cups/templates/ja/restart.tmpl
+usr/share/cups/templates/ja/samba-export.tmpl
+usr/share/cups/templates/ja/samba-exported.tmpl
+usr/share/cups/templates/ja/search.tmpl
+usr/share/cups/templates/ja/set-printer-options-header.tmpl
+usr/share/cups/templates/ja/set-printer-options-trailer.tmpl
+usr/share/cups/templates/ja/subscription-added.tmpl
+usr/share/cups/templates/ja/subscription-canceled.tmpl
+usr/share/cups/templates/ja/test-page.tmpl
+usr/share/cups/templates/ja/trailer.tmpl
+usr/share/cups/templates/ja/users.tmpl
usr/share/cups/templates/job-cancel.tmpl
usr/share/cups/templates/job-hold.tmpl
usr/share/cups/templates/job-move.tmpl
@@ -638,10 +638,10 @@ usr/share/cups/templates/job-release.tmpl
usr/share/cups/templates/job-restart.tmpl
usr/share/cups/templates/jobs-header.tmpl
usr/share/cups/templates/jobs.tmpl
-#usr/share/cups/templates/list-available-printers.tmpl
+usr/share/cups/templates/list-available-printers.tmpl
usr/share/cups/templates/modify-class.tmpl
usr/share/cups/templates/modify-printer.tmpl
-#usr/share/cups/templates/norestart.tmpl
+usr/share/cups/templates/norestart.tmpl
usr/share/cups/templates/option-boolean.tmpl
usr/share/cups/templates/option-conflict.tmpl
usr/share/cups/templates/option-header.tmpl
@@ -748,133 +748,133 @@ usr/share/cups/templates/trailer.tmpl
usr/share/cups/templates/users.tmpl
usr/share/cups/usb
usr/share/cups/usb/org.cups.usb-quirks
-#usr/share/doc/cups
-#usr/share/doc/cups/ca
-#usr/share/doc/cups/ca/index.html
-#usr/share/doc/cups/cs
-#usr/share/doc/cups/cs/index.html
-#usr/share/doc/cups/cups-printable.css
-#usr/share/doc/cups/cups.css
-#usr/share/doc/cups/es
-#usr/share/doc/cups/es/index.html
-#usr/share/doc/cups/fr
-#usr/share/doc/cups/fr/index.html
+usr/share/doc/cups
+usr/share/doc/cups/ca
+usr/share/doc/cups/ca/index.html
+usr/share/doc/cups/cs
+usr/share/doc/cups/cs/index.html
+usr/share/doc/cups/cups-printable.css
+usr/share/doc/cups/cups.css
+usr/share/doc/cups/es
+usr/share/doc/cups/es/index.html
+usr/share/doc/cups/fr
+usr/share/doc/cups/fr/index.html
usr/share/doc/cups/help
-#usr/share/doc/cups/help/accounting.html
-#usr/share/doc/cups/help/api-array.html
-#usr/share/doc/cups/help/api-cgi.html
-#usr/share/doc/cups/help/api-cups.html
-#usr/share/doc/cups/help/api-driver.html
-#usr/share/doc/cups/help/api-filedir.html
-#usr/share/doc/cups/help/api-filter.html
-#usr/share/doc/cups/help/api-httpipp.html
-#usr/share/doc/cups/help/api-mime.html
-#usr/share/doc/cups/help/api-overview.html
-#usr/share/doc/cups/help/api-ppd.html
-#usr/share/doc/cups/help/api-ppdc.html
-#usr/share/doc/cups/help/api-raster.html
-#usr/share/doc/cups/help/cgi.html
-#usr/share/doc/cups/help/glossary.html
-#usr/share/doc/cups/help/kerberos.html
-#usr/share/doc/cups/help/license.html
-#usr/share/doc/cups/help/man-backend.html
-#usr/share/doc/cups/help/man-cancel.html
-#usr/share/doc/cups/help/man-cups-config.html
-#usr/share/doc/cups/help/man-cups-lpd.html
-#usr/share/doc/cups/help/man-cups-snmp.html
-#usr/share/doc/cups/help/man-cupsaccept.html
-#usr/share/doc/cups/help/man-cupsaddsmb.html
-#usr/share/doc/cups/help/man-cupsd.html
-#usr/share/doc/cups/help/man-cupsenable.html
-#usr/share/doc/cups/help/man-cupstestdsc.html
-#usr/share/doc/cups/help/man-cupstestppd.html
-#usr/share/doc/cups/help/man-filter.html
-#usr/share/doc/cups/help/man-ipptool.html
-#usr/share/doc/cups/help/man-ipptoolfile.html
-#usr/share/doc/cups/help/man-lp.html
-#usr/share/doc/cups/help/man-lpadmin.html
-#usr/share/doc/cups/help/man-lpc.html
-#usr/share/doc/cups/help/man-lpinfo.html
-#usr/share/doc/cups/help/man-lpmove.html
-#usr/share/doc/cups/help/man-lpoptions.html
-#usr/share/doc/cups/help/man-lppasswd.html
-#usr/share/doc/cups/help/man-lpq.html
-#usr/share/doc/cups/help/man-lpr.html
-#usr/share/doc/cups/help/man-lprm.html
-#usr/share/doc/cups/help/man-lpstat.html
-#usr/share/doc/cups/help/man-mime.convs.html
-#usr/share/doc/cups/help/man-mime.types.html
-#usr/share/doc/cups/help/man-notifier.html
-#usr/share/doc/cups/help/man-ppdc.html
-#usr/share/doc/cups/help/man-ppdhtml.html
-#usr/share/doc/cups/help/man-ppdi.html
-#usr/share/doc/cups/help/man-ppdmerge.html
-#usr/share/doc/cups/help/man-ppdpo.html
-#usr/share/doc/cups/help/network.html
-#usr/share/doc/cups/help/options.html
-#usr/share/doc/cups/help/overview.html
-#usr/share/doc/cups/help/policies.html
-#usr/share/doc/cups/help/postscript-driver.html
-#usr/share/doc/cups/help/ppd-compiler.html
-#usr/share/doc/cups/help/raster-driver.html
-#usr/share/doc/cups/help/ref-access_log.html
-#usr/share/doc/cups/help/ref-classes-conf.html
-#usr/share/doc/cups/help/ref-client-conf.html
-#usr/share/doc/cups/help/ref-cups-files-conf.html
-#usr/share/doc/cups/help/ref-cupsd-conf.html
-#usr/share/doc/cups/help/ref-error_log.html
-#usr/share/doc/cups/help/ref-mailto-conf.html
-#usr/share/doc/cups/help/ref-page_log.html
-#usr/share/doc/cups/help/ref-ppdcfile.html
-#usr/share/doc/cups/help/ref-printers-conf.html
-#usr/share/doc/cups/help/ref-snmp-conf.html
-#usr/share/doc/cups/help/ref-subscriptions-conf.html
-#usr/share/doc/cups/help/security.html
-#usr/share/doc/cups/help/sharing.html
-#usr/share/doc/cups/help/spec-banner.html
-#usr/share/doc/cups/help/spec-cmp.html
-#usr/share/doc/cups/help/spec-command.html
-#usr/share/doc/cups/help/spec-design.html
-#usr/share/doc/cups/help/spec-ipp.html
-#usr/share/doc/cups/help/spec-pdf.html
-#usr/share/doc/cups/help/spec-postscript.html
-#usr/share/doc/cups/help/spec-ppd.html
-#usr/share/doc/cups/help/spec-raster.html
-#usr/share/doc/cups/help/spec-stp.html
-#usr/share/doc/cups/help/translation.html
-#usr/share/doc/cups/help/whatsnew.html
+usr/share/doc/cups/help/accounting.html
+usr/share/doc/cups/help/api-array.html
+usr/share/doc/cups/help/api-cgi.html
+usr/share/doc/cups/help/api-cups.html
+usr/share/doc/cups/help/api-driver.html
+usr/share/doc/cups/help/api-filedir.html
+usr/share/doc/cups/help/api-filter.html
+usr/share/doc/cups/help/api-httpipp.html
+usr/share/doc/cups/help/api-mime.html
+usr/share/doc/cups/help/api-overview.html
+usr/share/doc/cups/help/api-ppd.html
+usr/share/doc/cups/help/api-ppdc.html
+usr/share/doc/cups/help/api-raster.html
+usr/share/doc/cups/help/cgi.html
+usr/share/doc/cups/help/glossary.html
+usr/share/doc/cups/help/kerberos.html
+usr/share/doc/cups/help/license.html
+usr/share/doc/cups/help/man-backend.html
+usr/share/doc/cups/help/man-cancel.html
+usr/share/doc/cups/help/man-cups-config.html
+usr/share/doc/cups/help/man-cups-lpd.html
+usr/share/doc/cups/help/man-cups-snmp.html
+usr/share/doc/cups/help/man-cupsaccept.html
+usr/share/doc/cups/help/man-cupsaddsmb.html
+usr/share/doc/cups/help/man-cupsd.html
+usr/share/doc/cups/help/man-cupsenable.html
+usr/share/doc/cups/help/man-cupstestdsc.html
+usr/share/doc/cups/help/man-cupstestppd.html
+usr/share/doc/cups/help/man-filter.html
+usr/share/doc/cups/help/man-ipptool.html
+usr/share/doc/cups/help/man-ipptoolfile.html
+usr/share/doc/cups/help/man-lp.html
+usr/share/doc/cups/help/man-lpadmin.html
+usr/share/doc/cups/help/man-lpc.html
+usr/share/doc/cups/help/man-lpinfo.html
+usr/share/doc/cups/help/man-lpmove.html
+usr/share/doc/cups/help/man-lpoptions.html
+usr/share/doc/cups/help/man-lppasswd.html
+usr/share/doc/cups/help/man-lpq.html
+usr/share/doc/cups/help/man-lpr.html
+usr/share/doc/cups/help/man-lprm.html
+usr/share/doc/cups/help/man-lpstat.html
+usr/share/doc/cups/help/man-mime.convs.html
+usr/share/doc/cups/help/man-mime.types.html
+usr/share/doc/cups/help/man-notifier.html
+usr/share/doc/cups/help/man-ppdc.html
+usr/share/doc/cups/help/man-ppdhtml.html
+usr/share/doc/cups/help/man-ppdi.html
+usr/share/doc/cups/help/man-ppdmerge.html
+usr/share/doc/cups/help/man-ppdpo.html
+usr/share/doc/cups/help/network.html
+usr/share/doc/cups/help/options.html
+usr/share/doc/cups/help/overview.html
+usr/share/doc/cups/help/policies.html
+usr/share/doc/cups/help/postscript-driver.html
+usr/share/doc/cups/help/ppd-compiler.html
+usr/share/doc/cups/help/raster-driver.html
+usr/share/doc/cups/help/ref-access_log.html
+usr/share/doc/cups/help/ref-classes-conf.html
+usr/share/doc/cups/help/ref-client-conf.html
+usr/share/doc/cups/help/ref-cups-files-conf.html
+usr/share/doc/cups/help/ref-cupsd-conf.html
+usr/share/doc/cups/help/ref-error_log.html
+usr/share/doc/cups/help/ref-mailto-conf.html
+usr/share/doc/cups/help/ref-page_log.html
+usr/share/doc/cups/help/ref-ppdcfile.html
+usr/share/doc/cups/help/ref-printers-conf.html
+usr/share/doc/cups/help/ref-snmp-conf.html
+usr/share/doc/cups/help/ref-subscriptions-conf.html
+usr/share/doc/cups/help/security.html
+usr/share/doc/cups/help/sharing.html
+usr/share/doc/cups/help/spec-banner.html
+usr/share/doc/cups/help/spec-cmp.html
+usr/share/doc/cups/help/spec-command.html
+usr/share/doc/cups/help/spec-design.html
+usr/share/doc/cups/help/spec-ipp.html
+usr/share/doc/cups/help/spec-pdf.html
+usr/share/doc/cups/help/spec-postscript.html
+usr/share/doc/cups/help/spec-ppd.html
+usr/share/doc/cups/help/spec-raster.html
+usr/share/doc/cups/help/spec-stp.html
+usr/share/doc/cups/help/translation.html
+usr/share/doc/cups/help/whatsnew.html
usr/share/doc/cups/images
-#usr/share/doc/cups/images/color-wheel.png
-#usr/share/doc/cups/images/cups-block-diagram.png
-#usr/share/doc/cups/images/cups-command-chain.png
-#usr/share/doc/cups/images/cups-icon.png
-#usr/share/doc/cups/images/cups-postscript-chain.png
-#usr/share/doc/cups/images/cups-raster-chain.png
-#usr/share/doc/cups/images/cups.png
-#usr/share/doc/cups/images/left.gif
-#usr/share/doc/cups/images/raster-organization.png
-#usr/share/doc/cups/images/raster.png
-#usr/share/doc/cups/images/right.gif
-#usr/share/doc/cups/images/sample-image.png
-#usr/share/doc/cups/images/sel.gif
-#usr/share/doc/cups/images/smiley.jpg
-#usr/share/doc/cups/images/unsel.gif
-#usr/share/doc/cups/images/wait.gif
+usr/share/doc/cups/images/color-wheel.png
+usr/share/doc/cups/images/cups-block-diagram.png
+usr/share/doc/cups/images/cups-command-chain.png
+usr/share/doc/cups/images/cups-icon.png
+usr/share/doc/cups/images/cups-postscript-chain.png
+usr/share/doc/cups/images/cups-raster-chain.png
+usr/share/doc/cups/images/cups.png
+usr/share/doc/cups/images/left.gif
+usr/share/doc/cups/images/raster-organization.png
+usr/share/doc/cups/images/raster.png
+usr/share/doc/cups/images/right.gif
+usr/share/doc/cups/images/sample-image.png
+usr/share/doc/cups/images/sel.gif
+usr/share/doc/cups/images/smiley.jpg
+usr/share/doc/cups/images/unsel.gif
+usr/share/doc/cups/images/wait.gif
usr/share/doc/cups/index.html
-#usr/share/doc/cups/it
-#usr/share/doc/cups/it/index.html
-#usr/share/doc/cups/ja
-#usr/share/doc/cups/ja/index.html
+usr/share/doc/cups/it
+usr/share/doc/cups/it/index.html
+usr/share/doc/cups/ja
+usr/share/doc/cups/ja/index.html
usr/share/doc/cups/robots.txt
-#usr/share/doc/cups/ru
-#usr/share/doc/cups/ru/index.html
-#usr/share/locale/ca/cups_ca.po
-#usr/share/locale/cs/cups_cs.po
-#usr/share/locale/es/cups_es.po
-#usr/share/locale/fr/cups_fr.po
-#usr/share/locale/it/cups_it.po
-#usr/share/locale/ja/cups_ja.po
-#usr/share/locale/ru/cups_ru.po
+usr/share/doc/cups/ru
+usr/share/doc/cups/ru/index.html
+usr/share/locale/ca/cups_ca.po
+usr/share/locale/cs/cups_cs.po
+usr/share/locale/es/cups_es.po
+usr/share/locale/fr/cups_fr.po
+usr/share/locale/it/cups_it.po
+usr/share/locale/ja/cups_ja.po
+usr/share/locale/ru/cups_ru.po
#usr/share/man/man1/cancel.1.gz
#usr/share/man/man1/cups-config.1.gz
#usr/share/man/man1/cupstestdsc.1.gz
@@ -926,7 +926,7 @@ usr/share/doc/cups/robots.txt
#usr/share/man/man8/lpmove.8.gz
#usr/share/man/man8/reject.8.gz
var/cache/cups
-#var/cache/cups/rss
+var/cache/cups/rss
#var/ipfire/cups
var/ipfire/cups/cups-files.conf
var/ipfire/cups/cupsd.conf
diff --git a/lfs/configroot b/lfs/configroot
index 8250a77..3232d38 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -107,6 +107,7 @@ $(TARGET) :
cp $(DIR_SRC)/config/firewall/firewall-policy /usr/sbin/firewall-policy
cp $(DIR_SRC)/config/fwhosts/icmp-types $(CONFIG_ROOT)/fwhosts/icmp-types
cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices
+ cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices.default
# Oneliner configfiles
echo "ENABLED=off" > $(CONFIG_ROOT)/vpn/settings
echo "VPN_DELAYED_START=0" >>$(CONFIG_ROOT)/vpn/settings
diff --git a/lfs/cups b/lfs/cups
index 08b574b..60f7e21 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
-PAK_VER = 9
+PAK_VER = 10
DEPS = "ghostscript"
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-03-27 14:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140327140849.96B3320758@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox