IPFire-SCM September 2016

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 266735a12faddf4635d2b3a772c4f4e9a472763c
by git＠ipfire.org 12 Sep '16

12 Sep '16

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 266735a12faddf4635d2b3a772c4f4e9a472763c (commit) via 4e63727d2d3f71760b09e4be9e6d7543ce0a24ea (commit) via a80606ecb568f9def80015ed961362a276f1e4aa (commit) from 69f8d8ee6cc005c7ca9e0f5bdb0ea017f7a7c0c7 (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 266735a12faddf4635d2b3a772c4f4e9a472763c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 11:07:44 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e63727d2d3f71760b09e4be9e6d7543ce0a24ea Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Sep 10 19:25:22 2016 +0200 next: rootfile updates for 'unbound' and 'initscripts' These two came to my view during the last builds. I hope they're ok now. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a80606ecb568f9def80015ed961362a276f1e4aa Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Sep 10 14:35:39 2016 +0200 squid: Update to 3.5.21 For details, see: http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID_3_5_21.html Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/unbound | 3 +- config/rootfiles/common/x86_64/initscripts | 1 + lfs/squid | 15 +- ...=> squid-3.5.21-fix-max-file-descriptors.patch} | 0 src/patches/squid/squid-3.5-14067.patch | 381 --------------------- src/patches/squid/squid-3.5-14068.patch | 35 -- src/patches/squid/squid-3.5-14069.patch | 30 -- src/patches/squid/squid-3.5-14070.patch | 44 --- src/patches/squid/squid-3.5-14071.patch | 70 ---- src/patches/squid/squid-3.5-14072.patch | 33 -- src/patches/squid/squid-3.5-14073.patch | 151 -------- src/patches/squid/squid-3.5-14074.patch | 55 --- src/patches/squid/squid-3.5-14075.patch | 38 -- 15 files changed, 8 insertions(+), 850 deletions(-) rename src/patches/{squid-3.5.20-fix-max-file-descriptors.patch => squid-3.5.21-fix-max-file-descriptors.patch} (100%) delete mode 100644 src/patches/squid/squid-3.5-14067.patch delete mode 100644 src/patches/squid/squid-3.5-14068.patch delete mode 100644 src/patches/squid/squid-3.5-14069.patch delete mode 100644 src/patches/squid/squid-3.5-14070.patch delete mode 100644 src/patches/squid/squid-3.5-14071.patch delete mode 100644 src/patches/squid/squid-3.5-14072.patch delete mode 100644 src/patches/squid/squid-3.5-14073.patch delete mode 100644 src/patches/squid/squid-3.5-14074.patch delete mode 100644 src/patches/squid/squid-3.5-14075.patch Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a429d2c..e3d48c2 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -136,6 +136,7 @@ etc/rc.d/init.d/template #etc/rc.d/init.d/transmission etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry +etc/rc.d/init.d/unbound etc/rc.d/init.d/upnpd #etc/rc.d/init.d/vdr #etc/rc.d/init.d/vdradmin diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 2053bd9..8fb1680 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -137,6 +137,7 @@ etc/rc.d/init.d/template #etc/rc.d/init.d/transmission etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry +etc/rc.d/init.d/unbound etc/rc.d/init.d/upnpd #etc/rc.d/init.d/vdr #etc/rc.d/init.d/vdradmin diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index aee5808..463f5dc 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -14,9 +14,10 @@ usr/lib/libunbound.so.2.4.1 usr/sbin/unbound usr/sbin/unbound-anchor usr/sbin/unbound-checkconf -usr/sbin/unbound-dhcp-leases-bridge usr/sbin/unbound-control usr/sbin/unbound-control-setup +usr/sbin/unbound-dhcp-leases-bridge +usr/sbin/unbound-host #usr/share/man/man1/unbound-host.1 #usr/share/man/man3/libunbound.3 #usr/share/man/man3/ub_cancel.3 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 2053bd9..8fb1680 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -137,6 +137,7 @@ etc/rc.d/init.d/template #etc/rc.d/init.d/transmission etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry +etc/rc.d/init.d/unbound etc/rc.d/init.d/upnpd #etc/rc.d/init.d/vdr #etc/rc.d/init.d/vdradmin diff --git a/lfs/squid b/lfs/squid index 2d9c596..ae8e1e9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.20 +VER = 3.5.21 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 48fb18679a30606de98882528beab3a7 +$(DL_FILE)_MD5 = e6745a6e4ac0b48b7283861f64a40ae5 install : $(TARGET) @@ -70,16 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14067.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14068.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14069.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14070.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14071.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14072.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14073.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14074.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14075.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.20-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid-3.5.20-fix-max-file-descriptors.patch b/src/patches/squid-3.5.20-fix-max-file-descriptors.patch deleted file mode 100644 index b740b61..0000000 --- a/src/patches/squid-3.5.20-fix-max-file-descriptors.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.ac.~ Wed Apr 20 14:26:07 2016 -+++ configure.ac Fri Apr 22 17:20:46 2016 -@@ -3135,6 +3135,9 @@ - ;; - esac - -+SQUID_CHECK_DEFAULT_FD_SETSIZE -+SQUID_CHECK_MAXFD -+ - dnl --with-maxfd present for compatibility with Squid-2. - dnl undocumented in ./configure --help to encourage using the Squid-3 directive - AC_ARG_WITH(maxfd,, -@@ -3165,8 +3168,6 @@ - esac - ]) - --SQUID_CHECK_DEFAULT_FD_SETSIZE --SQUID_CHECK_MAXFD - if test "x$squid_filedescriptors_num" != "x"; then - AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) - fi diff --git a/src/patches/squid-3.5.21-fix-max-file-descriptors.patch b/src/patches/squid-3.5.21-fix-max-file-descriptors.patch new file mode 100644 index 0000000..b740b61 --- /dev/null +++ b/src/patches/squid-3.5.21-fix-max-file-descriptors.patch @@ -0,0 +1,21 @@ +--- configure.ac.~ Wed Apr 20 14:26:07 2016 ++++ configure.ac Fri Apr 22 17:20:46 2016 +@@ -3135,6 +3135,9 @@ + ;; + esac + ++SQUID_CHECK_DEFAULT_FD_SETSIZE ++SQUID_CHECK_MAXFD ++ + dnl --with-maxfd present for compatibility with Squid-2. + dnl undocumented in ./configure --help to encourage using the Squid-3 directive + AC_ARG_WITH(maxfd,, +@@ -3165,8 +3168,6 @@ + esac + ]) + +-SQUID_CHECK_DEFAULT_FD_SETSIZE +-SQUID_CHECK_MAXFD + if test "x$squid_filedescriptors_num" != "x"; then + AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) + fi diff --git a/src/patches/squid/squid-3.5-14067.patch b/src/patches/squid/squid-3.5-14067.patch deleted file mode 100644 index 8d9cb21..0000000 --- a/src/patches/squid/squid-3.5-14067.patch +++ /dev/null @@ -1,381 +0,0 @@ ------------------------------------------------------------- -revno: 14067 -revision-id: squid3(a)treenet.co.nz-20160723071620-1wzqpbyi1rk5w6vg -parent: squid3(a)treenet.co.nz-20160701113616-vpjak1pq4uecadd2 -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4534 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Sat 2016-07-23 19:16:20 +1200 -message: - Bug 4534: assertion failure in xcalloc when using many cache_dir ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160723071620-1wzqpbyi1rk5w6vg -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: fcd663f0fd4a24d505f81eb94ef95d627a4ca363 -# timestamp: 2016-07-23 07:24:01 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160701113616-\ -# vpjak1pq4uecadd2 -# -# Begin patch -=== modified file 'src/CacheDigest.cc' ---- src/CacheDigest.cc 2016-01-01 00:14:27 +0000 -+++ src/CacheDigest.cc 2016-07-23 07:16:20 +0000 -@@ -35,12 +35,12 @@ - static uint32_t hashed_keys[4]; - - static void --cacheDigestInit(CacheDigest * cd, int capacity, int bpe) -+cacheDigestInit(CacheDigest * cd, uint64_t capacity, uint8_t bpe) - { -- const size_t mask_size = cacheDigestCalcMaskSize(capacity, bpe); -+ const uint32_t mask_size = cacheDigestCalcMaskSize(capacity, bpe); - assert(cd); - assert(capacity > 0 && bpe > 0); -- assert(mask_size > 0); -+ assert(mask_size != 0); - cd->capacity = capacity; - cd->bits_per_entry = bpe; - cd->mask_size = mask_size; -@@ -50,7 +50,7 @@ - } - - CacheDigest * --cacheDigestCreate(int capacity, int bpe) -+cacheDigestCreate(uint64_t capacity, uint8_t bpe) - { - CacheDigest *cd = (CacheDigest *)memAllocate(MEM_CACHE_DIGEST); - assert(SQUID_MD5_DIGEST_LENGTH == 16); /* our hash functions rely on 16 byte keys */ -@@ -97,7 +97,7 @@ - - /* changes mask size, resets bits to 0, preserves "cd" pointer */ - void --cacheDigestChangeCap(CacheDigest * cd, int new_cap) -+cacheDigestChangeCap(CacheDigest * cd, uint64_t new_cap) - { - assert(cd); - cacheDigestClean(cd); -@@ -278,12 +278,12 @@ - storeAppendPrintf(e, "%s digest: size: %d bytes\n", - label ? label : "", stats.bit_count / 8 - ); -- storeAppendPrintf(e, "\t entries: count: %d capacity: %d util: %d%%\n", -+ storeAppendPrintf(e, "\t entries: count: %" PRIu64 " capacity: %" PRIu64 " util: %d%%\n", - cd->count, - cd->capacity, - xpercentInt(cd->count, cd->capacity) - ); -- storeAppendPrintf(e, "\t deletion attempts: %d\n", -+ storeAppendPrintf(e, "\t deletion attempts: %" PRIu64 "\n", - cd->del_count - ); - storeAppendPrintf(e, "\t bits: per entry: %d on: %d capacity: %d util: %d%%\n", -@@ -297,16 +297,18 @@ - ); - } - --size_t --cacheDigestCalcMaskSize(int cap, int bpe) -+uint32_t -+cacheDigestCalcMaskSize(uint64_t cap, uint8_t bpe) - { -- return (size_t) (cap * bpe + 7) / 8; -+ uint64_t bitCount = (cap * bpe) + 7; -+ assert(bitCount < INT_MAX); // dont 31-bit overflow later -+ return static_cast<uint32_t>(bitCount / 8); - } - - static void - cacheDigestHashKey(const CacheDigest * cd, const cache_key * key) - { -- const unsigned int bit_count = cd->mask_size * 8; -+ const uint32_t bit_count = cd->mask_size * 8; - unsigned int tmp_keys[4]; - /* we must memcpy to ensure alignment */ - memcpy(tmp_keys, key, sizeof(tmp_keys)); - -=== modified file 'src/CacheDigest.h' ---- src/CacheDigest.h 2016-01-01 00:14:27 +0000 -+++ src/CacheDigest.h 2016-07-23 07:16:20 +0000 -@@ -22,23 +22,23 @@ - { - public: - /* public, read-only */ -- char *mask; /* bit mask */ -- int mask_size; /* mask size in bytes */ -- int capacity; /* expected maximum for .count, not a hard limit */ -- int bits_per_entry; /* number of bits allocated for each entry from capacity */ -- int count; /* number of digested entries */ -- int del_count; /* number of deletions performed so far */ -+ uint64_t count; /* number of digested entries */ -+ uint64_t del_count; /* number of deletions performed so far */ -+ uint64_t capacity; /* expected maximum for .count, not a hard limit */ -+ char *mask; /* bit mask */ -+ uint32_t mask_size; /* mask size in bytes */ -+ int8_t bits_per_entry; /* number of bits allocated for each entry from capacity */ - }; - --CacheDigest *cacheDigestCreate(int capacity, int bpe); -+CacheDigest *cacheDigestCreate(uint64_t capacity, uint8_t bpe); - void cacheDigestDestroy(CacheDigest * cd); - CacheDigest *cacheDigestClone(const CacheDigest * cd); - void cacheDigestClear(CacheDigest * cd); --void cacheDigestChangeCap(CacheDigest * cd, int new_cap); -+void cacheDigestChangeCap(CacheDigest * cd, uint64_t new_cap); - int cacheDigestTest(const CacheDigest * cd, const cache_key * key); - void cacheDigestAdd(CacheDigest * cd, const cache_key * key); - void cacheDigestDel(CacheDigest * cd, const cache_key * key); --size_t cacheDigestCalcMaskSize(int cap, int bpe); -+uint32_t cacheDigestCalcMaskSize(uint64_t cap, uint8_t bpe); - int cacheDigestBitUtil(const CacheDigest * cd); - void cacheDigestGuessStatsUpdate(CacheDigestGuessStats * stats, int real_hit, int guess_hit); - void cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const char *label); - -=== modified file 'src/PeerDigest.h' ---- src/PeerDigest.h 2016-01-01 00:14:27 +0000 -+++ src/PeerDigest.h 2016-07-23 07:16:20 +0000 -@@ -52,7 +52,7 @@ - store_client *old_sc; - HttpRequest *request; - int offset; -- int mask_offset; -+ uint32_t mask_offset; - time_t start_time; - time_t resp_time; - time_t expires; - -=== modified file 'src/peer_digest.cc' ---- src/peer_digest.cc 2016-01-01 00:14:27 +0000 -+++ src/peer_digest.cc 2016-07-23 07:16:20 +0000 -@@ -754,7 +754,7 @@ - if (!reason && !size) { - if (!pd->cd) - reason = "null digest?!"; -- else if (fetch->mask_offset != (int)pd->cd->mask_size) -+ else if (fetch->mask_offset != pd->cd->mask_size) - reason = "premature end of digest?!"; - else if (!peerDigestUseful(pd)) - reason = "useless digest"; - -=== modified file 'src/store_digest.cc' ---- src/store_digest.cc 2016-01-01 00:14:27 +0000 -+++ src/store_digest.cc 2016-07-23 07:16:20 +0000 -@@ -76,36 +76,63 @@ - static void storeDigestRewriteFinish(StoreEntry * e); - static EVH storeDigestSwapOutStep; - static void storeDigestCBlockSwapOut(StoreEntry * e); --static int storeDigestCalcCap(void); --static int storeDigestResize(void); - static void storeDigestAdd(const StoreEntry *); - -+/// calculates digest capacity -+static uint64_t -+storeDigestCalcCap() -+{ -+ /* -+ * To-Do: Bloom proved that the optimal filter utilization is 50% (half of -+ * the bits are off). However, we do not have a formula to calculate the -+ * number of _entries_ we want to pre-allocate for. -+ */ -+ const uint64_t hi_cap = Store::Root().maxSize() / Config.Store.avgObjectSize; -+ const uint64_t lo_cap = 1 + Store::Root().currentSize() / Config.Store.avgObjectSize; -+ const uint64_t e_count = StoreEntry::inUseCount(); -+ uint64_t cap = e_count ? e_count : hi_cap; -+ debugs(71, 2, "have: " << e_count << ", want " << cap << -+ " entries; limits: [" << lo_cap << ", " << hi_cap << "]"); -+ -+ if (cap < lo_cap) -+ cap = lo_cap; -+ -+ /* do not enforce hi_cap limit, average-based estimation may be wrong -+ *if (cap > hi_cap) -+ * cap = hi_cap; -+ */ -+ -+ // Bug 4534: we still have to set an upper-limit at some reasonable value though. -+ // this matches cacheDigestCalcMaskSize doing (cap*bpe)+7 < INT_MAX -+ const uint64_t absolute_max = (INT_MAX -8) / Config.digest.bits_per_entry; -+ if (cap > absolute_max) { -+ static time_t last_loud = 0; -+ if (last_loud < squid_curtime - 86400) { -+ debugs(71, DBG_IMPORTANT, "WARNING: Cache Digest cannot store " << cap << " entries. Limiting to " << absolute_max); -+ last_loud = squid_curtime; -+ } else { -+ debugs(71, 3, "WARNING: Cache Digest cannot store " << cap << " entries. Limiting to " << absolute_max); -+ } -+ cap = absolute_max; -+ } -+ -+ return cap; -+} - #endif /* USE_CACHE_DIGESTS */ - --static void --storeDigestRegisterWithCacheManager(void) -+void -+storeDigestInit(void) - { - Mgr::RegisterAction("store_digest", "Store Digest", storeDigestReport, 0, 1); --} -- --/* -- * PUBLIC FUNCTIONS -- */ -- --void --storeDigestInit(void) --{ -- storeDigestRegisterWithCacheManager(); - - #if USE_CACHE_DIGESTS -- const int cap = storeDigestCalcCap(); -- - if (!Config.onoff.digest_generation) { - store_digest = NULL; - debugs(71, 3, "Local cache digest generation disabled"); - return; - } - -+ const uint64_t cap = storeDigestCalcCap(); - store_digest = cacheDigestCreate(cap, Config.digest.bits_per_entry); - debugs(71, DBG_IMPORTANT, "Local cache digest enabled; rebuild/rewrite every " << - (int) Config.digest.rebuild_period << "/" << -@@ -290,6 +317,31 @@ - storeDigestRebuildResume(); - } - -+/// \returns true if we actually resized the digest -+static bool -+storeDigestResize() -+{ -+ const uint64_t cap = storeDigestCalcCap(); -+ assert(store_digest); -+ uint64_t diff; -+ if (cap > store_digest->capacity) -+ diff = cap - store_digest->capacity; -+ else -+ diff = store_digest->capacity - cap; -+ debugs(71, 2, store_digest->capacity << " -> " << cap << "; change: " << -+ diff << " (" << xpercentInt(diff, store_digest->capacity) << "%)" ); -+ /* avoid minor adjustments */ -+ -+ if (diff <= store_digest->capacity / 10) { -+ debugs(71, 2, "small change, will not resize."); -+ return false; -+ } else { -+ debugs(71, 2, "big change, resizing."); -+ cacheDigestChangeCap(store_digest, cap); -+ } -+ return true; -+} -+ - /* called be Rewrite to push Rebuild forward */ - static void - storeDigestRebuildResume(void) -@@ -439,7 +491,7 @@ - assert(e); - /* _add_ check that nothing bad happened while we were waiting @?@ @?@ */ - -- if (sd_state.rewrite_offset + chunk_size > store_digest->mask_size) -+ if (static_cast<uint32_t>(sd_state.rewrite_offset + chunk_size) > store_digest->mask_size) - chunk_size = store_digest->mask_size - sd_state.rewrite_offset; - - e->append(store_digest->mask + sd_state.rewrite_offset, chunk_size); -@@ -451,7 +503,7 @@ - sd_state.rewrite_offset += chunk_size; - - /* are we done ? */ -- if (sd_state.rewrite_offset >= store_digest->mask_size) -+ if (static_cast<uint32_t>(sd_state.rewrite_offset) >= store_digest->mask_size) - storeDigestRewriteFinish(e); - else - eventAdd("storeDigestSwapOutStep", storeDigestSwapOutStep, data, 0.0, 1, false); -@@ -467,60 +519,10 @@ - sd_state.cblock.count = htonl(store_digest->count); - sd_state.cblock.del_count = htonl(store_digest->del_count); - sd_state.cblock.mask_size = htonl(store_digest->mask_size); -- sd_state.cblock.bits_per_entry = (unsigned char) -- Config.digest.bits_per_entry; -+ sd_state.cblock.bits_per_entry = Config.digest.bits_per_entry; - sd_state.cblock.hash_func_count = (unsigned char) CacheDigestHashFuncCount; - e->append((char *) &sd_state.cblock, sizeof(sd_state.cblock)); - } - --/* calculates digest capacity */ --static int --storeDigestCalcCap(void) --{ -- /* -- * To-Do: Bloom proved that the optimal filter utilization is 50% (half of -- * the bits are off). However, we do not have a formula to calculate the -- * number of _entries_ we want to pre-allocate for. -- */ -- const int hi_cap = Store::Root().maxSize() / Config.Store.avgObjectSize; -- const int lo_cap = 1 + Store::Root().currentSize() / Config.Store.avgObjectSize; -- const int e_count = StoreEntry::inUseCount(); -- int cap = e_count ? e_count :hi_cap; -- debugs(71, 2, "storeDigestCalcCap: have: " << e_count << ", want " << cap << -- " entries; limits: [" << lo_cap << ", " << hi_cap << "]"); -- -- if (cap < lo_cap) -- cap = lo_cap; -- -- /* do not enforce hi_cap limit, average-based estimation may be wrong -- *if (cap > hi_cap) -- * cap = hi_cap; -- */ -- return cap; --} -- --/* returns true if we actually resized the digest */ --static int --storeDigestResize(void) --{ -- const int cap = storeDigestCalcCap(); -- int diff; -- assert(store_digest); -- diff = abs(cap - store_digest->capacity); -- debugs(71, 2, "storeDigestResize: " << -- store_digest->capacity << " -> " << cap << "; change: " << -- diff << " (" << xpercentInt(diff, store_digest->capacity) << "%)" ); -- /* avoid minor adjustments */ -- -- if (diff <= store_digest->capacity / 10) { -- debugs(71, 2, "storeDigestResize: small change, will not resize."); -- return 0; -- } else { -- debugs(71, 2, "storeDigestResize: big change, resizing."); -- cacheDigestChangeCap(store_digest, cap); -- return 1; -- } --} -- - #endif /* USE_CACHE_DIGESTS */ - - -=== modified file 'src/tests/stub_CacheDigest.cc' ---- src/tests/stub_CacheDigest.cc 2016-01-01 00:14:27 +0000 -+++ src/tests/stub_CacheDigest.cc 2016-07-23 07:16:20 +0000 -@@ -16,11 +16,11 @@ - class CacheDigestGuessStats; - class StoreEntry; - --CacheDigest * cacheDigestCreate(int, int) STUB_RETVAL(NULL) -+CacheDigest * cacheDigestCreate(uint64_t, uint8_t) STUB_RETVAL(NULL) - void cacheDigestDestroy(CacheDigest *) STUB - CacheDigest * cacheDigestClone(const CacheDigest *) STUB_RETVAL(NULL) - void cacheDigestClear(CacheDigest * ) STUB --void cacheDigestChangeCap(CacheDigest *,int) STUB -+void cacheDigestChangeCap(CacheDigest *,uint64_t) STUB - int cacheDigestTest(const CacheDigest *, const cache_key *) STUB_RETVAL(1) - void cacheDigestAdd(CacheDigest *, const cache_key *) STUB - void cacheDigestDel(CacheDigest *, const cache_key *) STUB -@@ -28,5 +28,4 @@ - void cacheDigestGuessStatsUpdate(CacheDigestGuessStats *, int, int) STUB - void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, const char *) STUB - void cacheDigestReport(CacheDigest *, const char *, StoreEntry *) STUB --size_t cacheDigestCalcMaskSize(int, int) STUB_RETVAL(1) -- -+uint32_t cacheDigestCalcMaskSize(uint64_t, uint8_t) STUB_RETVAL(1) - diff --git a/src/patches/squid/squid-3.5-14068.patch b/src/patches/squid/squid-3.5-14068.patch deleted file mode 100644 index 4766e00..0000000 --- a/src/patches/squid/squid-3.5-14068.patch +++ /dev/null @@ -1,35 +0,0 @@ ------------------------------------------------------------- -revno: 14068 -revision-id: squid3(a)treenet.co.nz-20160723071930-cemledcltg8pkc28 -parent: squid3(a)treenet.co.nz-20160723071620-1wzqpbyi1rk5w6vg -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4542 -author: Anonymous <bigparrot(a)pirateperfection.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Sat 2016-07-23 19:19:30 +1200 -message: - Bug #4542: authentication credentials IP TTL updated incorrectly ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160723071930-cemledcltg8pkc28 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: ee0c6aab5414532d9554ef338cce049263902fd8 -# timestamp: 2016-07-23 07:24:05 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160723071620-\ -# 1wzqpbyi1rk5w6vg -# -# Begin patch -=== modified file 'src/auth/User.cc' ---- src/auth/User.cc 2016-01-01 00:14:27 +0000 -+++ src/auth/User.cc 2016-07-23 07:19:30 +0000 -@@ -284,7 +284,7 @@ - /* This ip has already been seen. */ - found = 1; - /* update IP ttl */ -- ipdata->ip_expiretime = squid_curtime; -+ ipdata->ip_expiretime = squid_curtime + ::Config.authenticateIpTTL; - } else if (ipdata->ip_expiretime <= squid_curtime) { - /* This IP has expired - remove from the seen list */ - dlinkDelete(&ipdata->node, &ip_list); - diff --git a/src/patches/squid/squid-3.5-14069.patch b/src/patches/squid/squid-3.5-14069.patch deleted file mode 100644 index 15ca37a..0000000 --- a/src/patches/squid/squid-3.5-14069.patch +++ /dev/null @@ -1,30 +0,0 @@ ------------------------------------------------------------- -revno: 14069 -revision-id: squidadm(a)squid-cache.org-20160723121351-iuc8hwstrqd0l1dv -parent: squid3(a)treenet.co.nz-20160723071930-cemledcltg8pkc28 -committer: Source Maintenance <squidadm(a)squid-cache.org> -branch nick: 3.5 -timestamp: Sat 2016-07-23 12:13:51 +0000 -message: - SourceFormat Enforcement ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squidadm(a)squid-cache.org-20160723121351-\ -# iuc8hwstrqd0l1dv -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: c9e37a723686ae2ee489ba7ec2e981ae153bda28 -# timestamp: 2016-07-23 12:50:56 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160723071930-\ -# cemledcltg8pkc28 -# -# Begin patch -=== modified file 'src/tests/stub_CacheDigest.cc' ---- src/tests/stub_CacheDigest.cc 2016-07-23 07:16:20 +0000 -+++ src/tests/stub_CacheDigest.cc 2016-07-23 12:13:51 +0000 -@@ -29,3 +29,4 @@ - void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, const char *) STUB - void cacheDigestReport(CacheDigest *, const char *, StoreEntry *) STUB - uint32_t cacheDigestCalcMaskSize(uint64_t, uint8_t) STUB_RETVAL(1) -+ - diff --git a/src/patches/squid/squid-3.5-14070.patch b/src/patches/squid/squid-3.5-14070.patch deleted file mode 100644 index 5fcc39f..0000000 --- a/src/patches/squid/squid-3.5-14070.patch +++ /dev/null @@ -1,44 +0,0 @@ ------------------------------------------------------------- -revno: 14070 -revision-id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx -parent: squidadm(a)squid-cache.org-20160723121351-iuc8hwstrqd0l1dv -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Sat 2016-08-06 02:59:33 +1200 -message: - Squid segfault via Ftp::Client::readControlReply(). - - Ftp::Client::scheduleReadControlReply(), which may called from the - asynchronous start() or readControlReply()/handleControlReply() - handlers, does not check whether the control connection is still usable - before using it. - - This is a Measurement Factory project. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 1c21ce821f9cbc22b3e8ff2b1029f7084b5f0643 -# timestamp: 2016-08-05 15:00:22 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squidadm(a)squid-cache.org-20160723121351-\ -# iuc8hwstrqd0l1dv -# -# Begin patch -=== modified file 'src/clients/FtpClient.cc' ---- src/clients/FtpClient.cc 2016-02-19 23:15:41 +0000 -+++ src/clients/FtpClient.cc 2016-08-05 14:59:33 +0000 -@@ -314,6 +314,11 @@ - /* We've already read some reply data */ - handleControlReply(); - } else { -+ -+ if (!Comm::IsConnOpen(ctrl.conn)) { -+ debugs(9, 3, "cannot read without ctrl " << ctrl.conn); -+ return; -+ } - /* - * Cancel the timeout on the Data socket (if any) and - * establish one on the control socket. - diff --git a/src/patches/squid/squid-3.5-14071.patch b/src/patches/squid/squid-3.5-14071.patch deleted file mode 100644 index 6b353ea..0000000 --- a/src/patches/squid/squid-3.5-14071.patch +++ /dev/null @@ -1,70 +0,0 @@ ------------------------------------------------------------- -revno: 14071 -revision-id: squid3(a)treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3 -parent: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4428 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Wed 2016-08-17 14:55:01 +1200 -message: - Bug 4428: mal-formed Cache-Control:stale-if-error header ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: b3b3ef13c45062a97bd5cc88c934019fe4af7a3c -# timestamp: 2016-08-17 02:55:20 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160805145933-\ -# 0cpyy47o8955lamx -# -# Begin patch -=== modified file 'src/HttpHdrCc.cc' ---- src/HttpHdrCc.cc 2016-01-01 00:14:27 +0000 -+++ src/HttpHdrCc.cc 2016-08-17 02:55:01 +0000 -@@ -257,6 +257,27 @@ - - /* for all options having values, "=value" after the name */ - switch (flag) { -+ case CC_BADHDR: -+ break; -+ case CC_PUBLIC: -+ break; -+ case CC_PRIVATE: -+ if (Private().size()) -+ packerPrintf(p, "=\"" SQUIDSTRINGPH "\"", SQUIDSTRINGPRINT(Private())); -+ break; -+ -+ case CC_NO_CACHE: -+ if (noCache().size()) -+ packerPrintf(p, "=\"" SQUIDSTRINGPH "\"", SQUIDSTRINGPRINT(noCache())); -+ break; -+ case CC_NO_STORE: -+ break; -+ case CC_NO_TRANSFORM: -+ break; -+ case CC_MUST_REVALIDATE: -+ break; -+ case CC_PROXY_REVALIDATE: -+ break; - case CC_MAX_AGE: - packerPrintf(p, "=%d", (int) maxAge()); - break; -@@ -272,8 +293,14 @@ - case CC_MIN_FRESH: - packerPrintf(p, "=%d", (int) minFresh()); - break; -- default: -- /* do nothing, directive was already printed */ -+ case CC_ONLY_IF_CACHED: -+ break; -+ case CC_STALE_IF_ERROR: -+ packerPrintf(p, "=%d", staleIfError()); -+ break; -+ case CC_OTHER: -+ case CC_ENUM_END: -+ // done below after the loop - break; - } - - diff --git a/src/patches/squid/squid-3.5-14072.patch b/src/patches/squid/squid-3.5-14072.patch deleted file mode 100644 index 228e773..0000000 --- a/src/patches/squid/squid-3.5-14072.patch +++ /dev/null @@ -1,33 +0,0 @@ ------------------------------------------------------------- -revno: 14072 -revision-id: squid3(a)treenet.co.nz-20160817025828-s4102klt2ei25tsm -parent: squid3(a)treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Wed 2016-08-17 14:58:28 +1200 -message: - Fix SSL-Bump failure results in SEGFAULT ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160817025828-s4102klt2ei25tsm -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 73877d276fba41282aeb5973207d02851d5eb784 -# timestamp: 2016-08-17 03:50:56 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160817025501-\ -# e66sjxm0bfy3ksn3 -# -# Begin patch -=== modified file 'src/client_side_request.cc' ---- src/client_side_request.cc 2016-05-06 08:24:29 +0000 -+++ src/client_side_request.cc 2016-08-17 02:58:28 +0000 -@@ -1811,7 +1811,7 @@ - repContext->setReplyToStoreEntry(e, "immediate SslBump error"); - errorAppendEntry(e, calloutContext->error); - calloutContext->error = NULL; -- if (calloutContext->readNextRequest) -+ if (calloutContext->readNextRequest && getConn()) - getConn()->flags.readMore = true; // resume any pipeline reads. - node = (clientStreamNode *)client_stream.tail->data; - clientStreamRead(node, this, node->readBuffer); - diff --git a/src/patches/squid/squid-3.5-14073.patch b/src/patches/squid/squid-3.5-14073.patch deleted file mode 100644 index b7915a4..0000000 --- a/src/patches/squid/squid-3.5-14073.patch +++ /dev/null @@ -1,151 +0,0 @@ ------------------------------------------------------------- -revno: 14073 -revision-id: squid3(a)treenet.co.nz-20160817051037-p0kaj2iw2u4u8iqj -parent: squid3(a)treenet.co.nz-20160817025828-s4102klt2ei25tsm -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4563 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Wed 2016-08-17 17:10:37 +1200 -message: - Bug 4563: duplicate code in httpMakeVaryMark ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160817051037-p0kaj2iw2u4u8iqj -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: bba9a17715b8759e9d70db2c75f70f3c6152ae8a -# timestamp: 2016-08-17 05:50:53 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160817025828-\ -# s4102klt2ei25tsm -# -# Begin patch -=== modified file 'src/http.cc' ---- src/http.cc 2016-04-01 06:15:31 +0000 -+++ src/http.cc 2016-08-17 05:10:37 +0000 -@@ -572,6 +572,38 @@ - /* NOTREACHED */ - } - -+/// assemble a variant key (vary-mark) from the given Vary header and HTTP request -+static void -+assembleVaryKey(String &vary, SBuf &vstr, const HttpRequest &request) -+{ -+ static const SBuf asterisk("*"); -+ const char *pos = nullptr; -+ const char *item = nullptr; -+ int ilen = 0; -+ -+ while (strListGetItem(&vary, ',', &item, &ilen, &pos)) { -+ SBuf name(item, ilen); -+ if (name == asterisk) { -+ vstr.clear(); -+ break; -+ } -+ name.toLower(); -+ if (!vstr.isEmpty()) -+ vstr.append(", ", 2); -+ vstr.append(name); -+ String hdr(request.header.getByName(name.c_str())); -+ const char *value = hdr.termedBuf(); -+ if (value) { -+ value = rfc1738_escape_part(value); -+ vstr.append("=\"", 2); -+ vstr.append(value); -+ vstr.append("\"", 1); -+ } -+ -+ hdr.clean(); -+ } -+} -+ - /* - * For Vary, store the relevant request headers as - * virtual headers in the reply -@@ -580,81 +612,16 @@ - SBuf - httpMakeVaryMark(HttpRequest * request, HttpReply const * reply) - { -- String vary, hdr; -- const char *pos = NULL; -- const char *item; -- const char *value; -- int ilen; - SBuf vstr; -- static const SBuf asterisk("*"); -+ String vary; - - vary = reply->header.getList(HDR_VARY); -- -- while (strListGetItem(&vary, ',', &item, &ilen, &pos)) { -- char *name = (char *)xmalloc(ilen + 1); -- xstrncpy(name, item, ilen + 1); -- Tolower(name); -- -- if (strcmp(name, "*") == 0) { -- /* Can not handle "Vary: *" withtout ETag support */ -- safe_free(name); -- vstr.clear(); -- break; -- } -- -- if (!vstr.isEmpty()) -- vstr.append(", ", 2); -- vstr.append(name); -- hdr = request->header.getByName(name); -- safe_free(name); -- value = hdr.termedBuf(); -- -- if (value) { -- value = rfc1738_escape_part(value); -- vstr.append("=\"", 2); -- vstr.append(value); -- vstr.append("\"", 1); -- } -- -- hdr.clean(); -- } -- -+ assembleVaryKey(vary, vstr, *request); -+ -+#if X_ACCELERATOR_VARY - vary.clean(); --#if X_ACCELERATOR_VARY -- -- pos = NULL; - vary = reply->header.getList(HDR_X_ACCELERATOR_VARY); -- -- while (strListGetItem(&vary, ',', &item, &ilen, &pos)) { -- char *name = (char *)xmalloc(ilen + 1); -- xstrncpy(name, item, ilen + 1); -- Tolower(name); -- -- if (strcmp(name, "*") == 0) { -- /* Can not handle "Vary: *" withtout ETag support */ -- safe_free(name); -- vstr.clear(); -- break; -- } -- -- if (!vstr.isEmpty()) -- vstr.append(", ", 2); -- vstr.append(name); -- hdr = request->header.getByName(name); -- safe_free(name); -- value = hdr.termedBuf(); -- -- if (value) { -- value = rfc1738_escape_part(value); -- vstr.append("=\"", 2); -- vstr.append(value); -- vstr.append("\"", 1); -- } -- -- hdr.clean(); -- } -- -- vary.clean(); -+ assembleVaryKey(vary, vstr, *request); - #endif - - debugs(11, 3, vstr); - diff --git a/src/patches/squid/squid-3.5-14074.patch b/src/patches/squid/squid-3.5-14074.patch deleted file mode 100644 index dbafbf0..0000000 --- a/src/patches/squid/squid-3.5-14074.patch +++ /dev/null @@ -1,55 +0,0 @@ ------------------------------------------------------------- -revno: 14074 -revision-id: squid3(a)treenet.co.nz-20160817054829-rl7q49ysi40sj01i -parent: squid3(a)treenet.co.nz-20160817051037-p0kaj2iw2u4u8iqj -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3025 -author: mkishi <mkishi(a)104.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Wed 2016-08-17 17:48:29 +1200 -message: - Bug 3025: Proxy-Authenticate problem using ICAP server ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160817054829-rl7q49ysi40sj01i -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: f4eb1b35dc72bba74a398070900a0951257e547e -# timestamp: 2016-08-17 05:50:56 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160817051037-\ -# p0kaj2iw2u4u8iqj -# -# Begin patch -=== modified file 'src/client_side_reply.cc' ---- src/client_side_reply.cc 2016-04-01 06:15:31 +0000 -+++ src/client_side_reply.cc 2016-08-17 05:48:29 +0000 -@@ -1305,8 +1305,14 @@ - - // if there is not configured a peer proxy with login=PASS or login=PASSTHRU option enabled - // remove the Proxy-Authenticate header -- if ( !request->peer_login || (strcmp(request->peer_login,"PASS") != 0 && strcmp(request->peer_login,"PASSTHRU") != 0)) -- reply->header.delById(HDR_PROXY_AUTHENTICATE); -+ if ( !request->peer_login || (strcmp(request->peer_login,"PASS") != 0 && strcmp(request->peer_login,"PASSTHRU") != 0)) { -+#if USE_ADAPTATION -+ // but allow adaptation services to authenticate clients -+ // via request satisfaction -+ if (!http->requestSatisfactionMode()) -+#endif -+ reply->header.delById(HDR_PROXY_AUTHENTICATE); -+ } - - reply->header.removeHopByHopEntries(); - - -=== modified file 'src/client_side_request.h' ---- src/client_side_request.h 2016-01-01 00:14:27 +0000 -+++ src/client_side_request.h 2016-08-17 05:48:29 +0000 -@@ -140,6 +140,7 @@ - - public: - void startAdaptation(const Adaptation::ServiceGroupPointer &g); -+ bool requestSatisfactionMode() const { return request_satisfaction_mode; } - - // private but exposed for ClientRequestContext - void handleAdaptationFailure(int errDetail, bool bypassable = false); - diff --git a/src/patches/squid/squid-3.5-14075.patch b/src/patches/squid/squid-3.5-14075.patch deleted file mode 100644 index 8c0b5a3..0000000 --- a/src/patches/squid/squid-3.5-14075.patch +++ /dev/null @@ -1,38 +0,0 @@ ------------------------------------------------------------- -revno: 14075 -revision-id: squid3(a)treenet.co.nz-20160817133413-vdmm0d6kvo8bfszk -parent: squid3(a)treenet.co.nz-20160817054829-rl7q49ysi40sj01i -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Thu 2016-08-18 01:34:13 +1200 -message: - Fix logic error in rev.13930 - - Using !=0 on both string compares means any login= value will permit - 40x responses through. Only PASS and PASSTHRU should be doing that. - - Detected by Coverity Scan. Issue 1364711 ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160817133413-vdmm0d6kvo8bfszk -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 31f0c4e0f435e0aa994ffe8937e4d4c58fed37f5 -# timestamp: 2016-08-17 13:34:59 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20160817054829-\ -# rl7q49ysi40sj01i -# -# Begin patch -=== modified file 'src/tunnel.cc' ---- src/tunnel.cc 2016-01-01 00:14:27 +0000 -+++ src/tunnel.cc 2016-08-17 13:34:13 +0000 -@@ -476,7 +476,7 @@ - - // we need to relay the 401/407 responses when login=PASS(THRU) - const char *pwd = server.conn->getPeer()->login; -- const bool relay = pwd && (strcmp(pwd, "PASS") != 0 || strcmp(pwd, "PASSTHRU") != 0) && -+ const bool relay = pwd && (strcmp(pwd, "PASS") == 0 || strcmp(pwd, "PASSTHRU") == 0) && - (*status_ptr == Http::scProxyAuthenticationRequired || - *status_ptr == Http::scUnauthorized); - - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d9157db9289ad3fdc86d5239163a25244161c597
by git＠ipfire.org 12 Sep '16

12 Sep '16

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 3.x development tree". The branch, master has been updated via d9157db9289ad3fdc86d5239163a25244161c597 (commit) from 58e0cdc69440670791bf7fec4fe9eaf17d80e390 (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 d9157db9289ad3fdc86d5239163a25244161c597 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Fri Sep 9 10:03:22 2016 +0000 cups: Update to 2.1.4 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: cups/cups.nm | 6 +- cups/patches/001_cups-no-gzip-man.patch | 18 - cups/patches/002_cups-system-auth.patch | 38 - cups/patches/003_cups-multilib.patch | 16 - cups/patches/004_cups-banners.patch | 12 - cups/patches/005_cups-serverbin-compat.patch | 190 -- cups/patches/006_cups-no-export-ssllibs.patch | 12 - cups/patches/007_cups-direct-usb.patch | 27 - cups/patches/008_cups-lpr-help.patch | 48 - cups/patches/009_cups-peercred.patch | 11 - cups/patches/010_cups-pid.patch | 37 - cups/patches/011_cups-eggcups.patch | 130 -- cups/patches/012_cups-driverd-timeout.patch | 21 - cups/patches/013_cups-strict-ppd-line-length.patch | 30 - cups/patches/014_cups-logrotate.patch | 63 - cups/patches/015_cups-usb-paperout.patch | 52 - cups/patches/016_cups-res_init.patch | 26 - cups/patches/017_cups-filter-debug.patch | 32 - cups/patches/018_cups-uri-compat.patch | 51 - cups/patches/019_cups-cups-get-classes.patch | 89 - cups/patches/020_cups-str3382.patch | 64 - cups/patches/021_cups-0755.patch | 21 - cups/patches/022_cups-hp-deviceid-oid.patch | 21 - cups/patches/023_cups-dnssd-deviceid.patch | 38 - cups/patches/024_cups-ricoh-deviceid-oid.patch | 21 - cups/patches/025_cups-systemd-socket.patch | 395 ---- cups/patches/026_cups-lspp.patch | 1999 -------------------- 27 files changed, 3 insertions(+), 3465 deletions(-) delete mode 100644 cups/patches/001_cups-no-gzip-man.patch delete mode 100644 cups/patches/002_cups-system-auth.patch delete mode 100644 cups/patches/003_cups-multilib.patch delete mode 100644 cups/patches/004_cups-banners.patch delete mode 100644 cups/patches/005_cups-serverbin-compat.patch delete mode 100644 cups/patches/006_cups-no-export-ssllibs.patch delete mode 100644 cups/patches/007_cups-direct-usb.patch delete mode 100644 cups/patches/008_cups-lpr-help.patch delete mode 100644 cups/patches/009_cups-peercred.patch delete mode 100644 cups/patches/010_cups-pid.patch delete mode 100644 cups/patches/011_cups-eggcups.patch delete mode 100644 cups/patches/012_cups-driverd-timeout.patch delete mode 100644 cups/patches/013_cups-strict-ppd-line-length.patch delete mode 100644 cups/patches/014_cups-logrotate.patch delete mode 100644 cups/patches/015_cups-usb-paperout.patch delete mode 100644 cups/patches/016_cups-res_init.patch delete mode 100644 cups/patches/017_cups-filter-debug.patch delete mode 100644 cups/patches/018_cups-uri-compat.patch delete mode 100644 cups/patches/019_cups-cups-get-classes.patch delete mode 100644 cups/patches/020_cups-str3382.patch delete mode 100644 cups/patches/021_cups-0755.patch delete mode 100644 cups/patches/022_cups-hp-deviceid-oid.patch delete mode 100644 cups/patches/023_cups-dnssd-deviceid.patch delete mode 100644 cups/patches/024_cups-ricoh-deviceid-oid.patch delete mode 100644 cups/patches/025_cups-systemd-socket.patch delete mode 100644 cups/patches/026_cups-lspp.patch Difference in files: diff --git a/cups/cups.nm b/cups/cups.nm index 3b5672b..5abb804 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -4,7 +4,7 @@ ############################################################################### name = cups -version = 1.6.1 +version = 2.1.4 release = 1 groups = Applications/Printing @@ -17,8 +17,8 @@ description by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems. end -source_dl = http://ftp.easysw.com/pub/cups/%{version}/ -sources = %{thisapp}-source.tar.bz2 +source_dl = https://github.com/apple/cups/releases/download/release-%{version}/ +sources = %{thisapp}-source.tar.gz build requires diff --git a/cups/patches/001_cups-no-gzip-man.patch b/cups/patches/001_cups-no-gzip-man.patch deleted file mode 100644 index cabfcf1..0000000 --- a/cups/patches/001_cups-no-gzip-man.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up cups-1.6b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.6b1/config-scripts/cups-manpages.m4 ---- cups-1.6b1/config-scripts/cups-manpages.m4.no-gzip-man 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/config-scripts/cups-manpages.m4 2012-05-25 14:57:01.959845267 +0200 -@@ -69,10 +69,10 @@ case "$uname" in - ;; - Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) diff --git a/cups/patches/002_cups-system-auth.patch b/cups/patches/002_cups-system-auth.patch deleted file mode 100644 index 60117a9..0000000 --- a/cups/patches/002_cups-system-auth.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth ---- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 -+++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200 -@@ -0,0 +1,4 @@ -+#%PAM-1.0 -+# Use password-auth common PAM configuration for the daemon -+auth include password-auth -+account include password-auth -diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth ---- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 -+++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth -diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile ---- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200 -+++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200 -@@ -90,10 +90,16 @@ install-data: - done - -if test x$(PAMDIR) != x; then \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ -- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ if test -f /etc/pam.d/password-auth; then \ -+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ -+ elif test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ - else \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ else \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ fi ; \ - fi ; \ - fi - diff --git a/cups/patches/003_cups-multilib.patch b/cups/patches/003_cups-multilib.patch deleted file mode 100644 index 3c6bc39..0000000 --- a/cups/patches/003_cups-multilib.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up cups-1.5b1/cups-config.in.multilib cups-1.5b1/cups-config.in ---- cups-1.5b1/cups-config.in.multilib 2010-06-16 02:48:25.000000000 +0200 -+++ cups-1.5b1/cups-config.in 2011-05-23 17:33:31.000000000 +0200 -@@ -22,8 +22,10 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - bindir=@bindir@ - includedir=@includedir@ --libdir=@libdir@ --imagelibdir=@libdir@ -+# Fetch libdir from gnutls's pkg-config script. This is a bit -+# of a cheat, but the cups-devel package requires gnutls-devel anyway. -+libdir=`pkg-config --variable=libdir gnutls` -+imagelibdir=`pkg-config --variable=libdir gnutls` - datarootdir=@datadir@ - datadir=@datadir@ - sysconfdir=@sysconfdir@ diff --git a/cups/patches/004_cups-banners.patch b/cups/patches/004_cups-banners.patch deleted file mode 100644 index aa19282..0000000 --- a/cups/patches/004_cups-banners.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.5b1/scheduler/banners.c.banners cups-1.5b1/scheduler/banners.c ---- cups-1.5b1/scheduler/banners.c.banners 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/banners.c 2011-05-23 17:35:30.000000000 +0200 -@@ -110,6 +110,8 @@ cupsdLoadBanners(const char *d) /* I - - if ((ext = strrchr(dent->filename, '.')) != NULL) - if (!strcmp(ext, ".bck") || - !strcmp(ext, ".bak") || -+ !strcmp(ext, ".rpmnew") || -+ !strcmp(ext, ".rpmsave") || - !strcmp(ext, ".sav")) - continue; - diff --git a/cups/patches/005_cups-serverbin-compat.patch b/cups/patches/005_cups-serverbin-compat.patch deleted file mode 100644 index 0ca72fd..0000000 --- a/cups/patches/005_cups-serverbin-compat.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.c ---- cups-1.5b1/scheduler/conf.c.serverbin-compat 2011-05-20 06:24:54.000000000 +0200 -+++ cups-1.5b1/scheduler/conf.c 2011-05-23 17:20:33.000000000 +0200 -@@ -491,6 +491,9 @@ cupsdReadConfiguration(void) - cupsdClearString(&ServerName); - cupsdClearString(&ServerAdmin); - cupsdSetString(&ServerBin, CUPS_SERVERBIN); -+#ifdef __x86_64__ -+ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); -+#endif /* __x86_64__ */ - cupsdSetString(&RequestRoot, CUPS_REQUESTS); - cupsdSetString(&CacheDir, CUPS_CACHEDIR); - cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -1378,7 +1381,12 @@ cupsdReadConfiguration(void) - * Read the MIME type and conversion database... - */ - -+#ifdef __x86_64__ -+ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, -+ ServerBin_compat); -+#else - snprintf(temp, sizeof(temp), "%s/filter", ServerBin); -+#endif - snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); - - MimeDatabase = mimeNew(); -diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.h ---- cups-1.5b1/scheduler/conf.h.serverbin-compat 2011-04-22 19:47:03.000000000 +0200 -+++ cups-1.5b1/scheduler/conf.h 2011-05-23 15:34:25.000000000 +0200 -@@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) - /* Root directory for scheduler */ - *ServerBin VALUE(NULL), - /* Root directory for binaries */ -+#ifdef __x86_64__ -+ *ServerBin_compat VALUE(NULL), -+ /* Compat directory for binaries */ -+#endif /* __x86_64__ */ - *StateDir VALUE(NULL), - /* Root directory for state data */ - *RequestRoot VALUE(NULL), -diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c ---- cups-1.5b1/scheduler/env.c.serverbin-compat 2011-01-11 04:48:42.000000000 +0100 -+++ cups-1.5b1/scheduler/env.c 2011-05-23 17:07:17.000000000 +0200 -@@ -218,8 +218,13 @@ cupsdUpdateEnv(void) - set_if_undefined("LD_PRELOAD", NULL); - set_if_undefined("NLSPATH", NULL); - if (find_env("PATH") < 0) -+#ifdef __x86_64__ -+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR -+ ":/bin:/usr/bin", ServerBin, ServerBin_compat); -+#else /* ! defined(__x86_64__) */ - cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR - ":/bin:/usr/bin", ServerBin); -+#endif - set_if_undefined("SERVER_ADMIN", ServerAdmin); - set_if_undefined("SHLIB_PATH", NULL); - set_if_undefined("SOFTWARE", CUPS_MINIMAL); -diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c ---- cups-1.5b1/scheduler/ipp.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/ipp.c 2011-05-23 16:09:57.000000000 +0200 -@@ -2586,9 +2586,18 @@ add_printer(cupsd_client_t *con, /* I - - * Could not find device in list! - */ - -+#ifdef __x86_64__ -+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat, -+ scheme); -+ if (access(srcfile, X_OK)) -+ { -+#endif /* __x86_64__ */ - send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad device-uri scheme \"%s\"."), scheme); - return; -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c ---- cups-1.5b1/scheduler/job.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/job.c 2011-05-23 16:18:57.000000000 +0200 -@@ -1047,8 +1047,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I - i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) - { - if (filter->filter[0] != '/') -- snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -- filter->filter); -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", -+ ServerBin_compat, filter->filter); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Filter '%s' not in %s/filter!", -+ filter->filter, ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ * messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+ } -+ } -+#endif /* __x86_64__ */ -+ } - else - strlcpy(command, filter->filter, sizeof(command)); - -@@ -1199,6 +1223,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - { - cupsdClosePipe(job->back_pipes); - cupsdClosePipe(job->side_pipes); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -+ scheme); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but we found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Backend '%s' not in %s/backend!", scheme, -+ ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -+ scheme); -+ } -+ } -+#endif /* __x86_64__ */ - - close(job->status_pipes[1]); - job->status_pipes[1] = -1; -diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/printers.c ---- cups-1.5b1/scheduler/printers.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/printers.c 2011-05-23 17:09:04.000000000 +0200 -@@ -1030,9 +1030,19 @@ cupsdLoadAllPrinters(void) - * Backend does not exist, stop printer... - */ - -+#ifdef __x86_64__ -+ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, -+ p->device_uri); -+ if (access(line, 0)) -+ { -+#endif /* __x86_64__ */ -+ - p->state = IPP_PRINTER_STOPPED; - snprintf(p->state_message, sizeof(p->state_message), - "Backend %s does not exist!", line); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -@@ -3621,8 +3631,20 @@ add_printer_filter( - else - snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); - -+#ifdef __x86_64__ -+ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, -+ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) { -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, -+ program); -+ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, -+ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, -+ program); -+ } -+#else /* ! defined(__x86_64__) */ - _cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, - cupsdLogFCMessage, p); -+#endif - } - - /* diff --git a/cups/patches/006_cups-no-export-ssllibs.patch b/cups/patches/006_cups-no-export-ssllibs.patch deleted file mode 100644 index de277d8..0000000 --- a/cups/patches/006_cups-no-export-ssllibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.5.3/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5.3/config-scripts/cups-ssl.m4 ---- cups-1.5.3/config-scripts/cups-ssl.m4.no-export-ssllibs 2012-03-21 05:45:48.000000000 +0100 -+++ cups-1.5.3/config-scripts/cups-ssl.m4 2012-05-15 16:47:13.753314620 +0200 -@@ -173,7 +173,7 @@ AC_SUBST(IPPALIASES) - AC_SUBST(SSLFLAGS) - AC_SUBST(SSLLIBS) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) - - dnl diff --git a/cups/patches/007_cups-direct-usb.patch b/cups/patches/007_cups-direct-usb.patch deleted file mode 100644 index 4e25ce7..0000000 --- a/cups/patches/007_cups-direct-usb.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up cups-1.5b1/backend/usb-unix.c.direct-usb cups-1.5b1/backend/usb-unix.c ---- cups-1.5b1/backend/usb-unix.c.direct-usb 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/backend/usb-unix.c 2011-05-23 17:52:14.000000000 +0200 -@@ -102,6 +102,9 @@ print_device(const char *uri, /* I - De - _cups_strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -+ if (use_bc && !strncmp(uri, "usb:/dev/", 9)) -+ use_bc = 0; -+ - if ((device_fd = open_device(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) -@@ -331,12 +334,7 @@ open_device(const char *uri, /* I - Dev - if (!strncmp(uri, "usb:/dev/", 9)) - #ifdef __linux - { -- /* -- * Do not allow direct devices anymore... -- */ -- -- errno = ENODEV; -- return (-1); -+ return (open(uri + 4, O_RDWR | O_EXCL)); - } - else if (!strncmp(uri, "usb://", 6)) - { diff --git a/cups/patches/008_cups-lpr-help.patch b/cups/patches/008_cups-lpr-help.patch deleted file mode 100644 index c42434d..0000000 --- a/cups/patches/008_cups-lpr-help.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up cups-1.5b1/berkeley/lpr.c.lpr-help cups-1.5b1/berkeley/lpr.c ---- cups-1.5b1/berkeley/lpr.c.lpr-help 2011-03-21 23:02:00.000000000 +0100 -+++ cups-1.5b1/berkeley/lpr.c 2011-05-23 17:58:06.000000000 +0200 -@@ -24,6 +24,31 @@ - #include <cups/cups-private.h> - - -+static void -+usage (const char *name) -+{ -+ _cupsLangPrintf(stdout, -+"Usage: %s [OPTION] [ file(s) ]\n" -+"Print files.\n\n" -+" -E force encryption\n" -+" -H server[:port] specify alternate server\n" -+" -C title, -J title, -T title\n" -+" set the job name\n\n" -+" -P destination/instance print to named printer\n" -+" -U username specify alternate username\n" -+" -# num-copies set number of copies\n" -+" -h disable banner printing\n" -+" -l print without filtering\n" -+" -m send email on completion\n" -+" -o option[=value] set a job option\n" -+" -p format text file with header\n" -+" -q hold job for printing\n" -+" -r delete files after printing\n" -+"\nWith no file given, read standard input.\n" -+, name); -+} -+ -+ - /* - * 'main()' - Parse options and send files for printing. - */ -@@ -270,6 +294,12 @@ main(int argc, /* I - Number of comm - break; - - default : -+ if (!strcmp (argv[i], "--help")) -+ { -+ usage (argv[0]); -+ return (0); -+ } -+ - _cupsLangPrintf(stderr, - _("%s: Error - unknown option \"%c\"."), argv[0], - argv[i][1]); diff --git a/cups/patches/009_cups-peercred.patch b/cups/patches/009_cups-peercred.patch deleted file mode 100644 index a106abb..0000000 --- a/cups/patches/009_cups-peercred.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.5b1/scheduler/auth.c.peercred cups-1.5b1/scheduler/auth.c ---- cups-1.5b1/scheduler/auth.c.peercred 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/auth.c 2011-05-23 18:00:18.000000000 +0200 -@@ -52,6 +52,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include <grp.h> - #ifdef HAVE_SHADOW_H diff --git a/cups/patches/010_cups-pid.patch b/cups/patches/010_cups-pid.patch deleted file mode 100644 index 23ffd47..0000000 --- a/cups/patches/010_cups-pid.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up cups-1.5b1/scheduler/main.c.pid cups-1.5b1/scheduler/main.c ---- cups-1.5b1/scheduler/main.c.pid 2011-05-18 22:44:16.000000000 +0200 -+++ cups-1.5b1/scheduler/main.c 2011-05-23 18:01:20.000000000 +0200 -@@ -311,6 +311,8 @@ main(int argc, /* I - Number of comm - * Setup signal handlers for the parent... - */ - -+ pid_t pid; -+ - #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGUSR1, parent_handler); - sigset(SIGCHLD, parent_handler); -@@ -334,7 +336,7 @@ main(int argc, /* I - Number of comm - signal(SIGHUP, SIG_IGN); - #endif /* HAVE_SIGSET */ - -- if (fork() > 0) -+ if ((pid = fork()) > 0) - { - /* - * OK, wait for the child to startup and send us SIGUSR1 or to crash -@@ -346,7 +348,15 @@ main(int argc, /* I - Number of comm - sleep(1); - - if (parent_signal == SIGUSR1) -+ { -+ FILE *f = fopen ("/var/run/cupsd.pid", "w"); -+ if (f) -+ { -+ fprintf (f, "%d\n", pid); -+ fclose (f); -+ } - return (0); -+ } - - if (wait(&i) < 0) - { diff --git a/cups/patches/011_cups-eggcups.patch b/cups/patches/011_cups-eggcups.patch deleted file mode 100644 index 981d920..0000000 --- a/cups/patches/011_cups-eggcups.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -up cups-1.5.3/backend/ipp.c.eggcups cups-1.5.3/backend/ipp.c ---- cups-1.5.3/backend/ipp.c.eggcups 2012-05-05 01:00:01.000000000 +0200 -+++ cups-1.5.3/backend/ipp.c 2012-05-15 16:50:41.142868986 +0200 -@@ -138,6 +138,70 @@ static cups_array_t *state_reasons; /* A - static char tmpfilename[1024] = ""; - /* Temporary spool file name */ - -+#if HAVE_DBUS -+#include <dbus/dbus.h> -+ -+static DBusConnection *dbus_connection = NULL; -+ -+static int -+init_dbus (void) -+{ -+ DBusConnection *connection; -+ DBusError error; -+ -+ if (dbus_connection && -+ !dbus_connection_get_is_connected (dbus_connection)) { -+ dbus_connection_unref (dbus_connection); -+ dbus_connection = NULL; -+ } -+ -+ dbus_error_init (&error); -+ connection = dbus_bus_get (getuid () ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); -+ if (connection == NULL) { -+ dbus_error_free (&error); -+ return -1; -+ } -+ -+ dbus_connection = connection; -+ return 0; -+} -+ -+int -+dbus_broadcast_queued_remote (const char *printer_uri, -+ ipp_status_t status, -+ unsigned int local_job_id, -+ unsigned int remote_job_id, -+ const char *username, -+ const char *printer_name) -+{ -+ DBusMessage *message; -+ DBusMessageIter iter; -+ const char *errstr; -+ -+ if (!dbus_connection || !dbus_connection_get_is_connected (dbus_connection)) { -+ if (init_dbus () || !dbus_connection) -+ return -1; -+ } -+ -+ errstr = ippErrorString (status); -+ message = dbus_message_new_signal ("/com/redhat/PrinterSpooler", -+ "com.redhat.PrinterSpooler", -+ "JobQueuedRemote"); -+ dbus_message_iter_init_append (message, &iter); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_uri); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &errstr); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &local_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &remote_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &username); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_name); -+ -+ dbus_connection_send (dbus_connection, message, NULL); -+ dbus_connection_flush (dbus_connection); -+ dbus_message_unref (message); -+ -+ return 0; -+} -+#endif /* HAVE_DBUS */ - - /* - * Local functions... -@@ -1520,6 +1584,15 @@ main(int argc, /* I - Number of comm - _("Print file accepted - job ID %d."), job_id); - } - -+#if HAVE_DBUS -+ dbus_broadcast_queued_remote (argv[0], -+ ipp_status, -+ atoi (argv[1]), -+ job_id, -+ argv[2], -+ getenv ("PRINTER")); -+#endif /* HAVE_DBUS */ -+ - fprintf(stderr, "DEBUG: job-id=%d\n", job_id); - ippDelete(response); - -diff -up cups-1.5.3/backend/Makefile.eggcups cups-1.5.3/backend/Makefile ---- cups-1.5.3/backend/Makefile.eggcups 2012-04-23 19:42:12.000000000 +0200 -+++ cups-1.5.3/backend/Makefile 2012-05-15 16:48:17.253871982 +0200 -@@ -212,7 +212,7 @@ dnssd: dnssd.o ../cups/$(LIBCUPS) libbac - - ipp: ipp.o ../cups/$(LIBCUPS) libbackend.a - echo Linking $@... -- $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) -+ $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS) - $(RM) http - $(LN) ipp http - -diff -up cups-1.5.3/scheduler/subscriptions.c.eggcups cups-1.5.3/scheduler/subscriptions.c ---- cups-1.5.3/scheduler/subscriptions.c.eggcups 2012-02-12 06:48:09.000000000 +0100 -+++ cups-1.5.3/scheduler/subscriptions.c 2012-05-15 16:48:17.253871982 +0200 -@@ -1314,13 +1314,13 @@ cupsd_send_dbus(cupsd_eventmask_t event, - what = "PrinterAdded"; - else if (event & CUPSD_EVENT_PRINTER_DELETED) - what = "PrinterRemoved"; -- else if (event & CUPSD_EVENT_PRINTER_CHANGED) -- what = "QueueChanged"; - else if (event & CUPSD_EVENT_JOB_CREATED) - what = "JobQueuedLocal"; - else if ((event & CUPSD_EVENT_JOB_STATE) && job && - job->state_value == IPP_JOB_PROCESSING) - what = "JobStartedLocal"; -+ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED)) -+ what = "QueueChanged"; - else - return; - -@@ -1356,7 +1356,7 @@ cupsd_send_dbus(cupsd_eventmask_t event, - dbus_message_append_iter_init(message, &iter); - if (dest) - dbus_message_iter_append_string(&iter, dest->name); -- if (job) -+ if (job && strcmp (what, "QueueChanged") != 0) - { - dbus_message_iter_append_uint32(&iter, job->id); - dbus_message_iter_append_string(&iter, job->username); diff --git a/cups/patches/012_cups-driverd-timeout.patch b/cups/patches/012_cups-driverd-timeout.patch deleted file mode 100644 index cb9e5cf..0000000 --- a/cups/patches/012_cups-driverd-timeout.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.5.0/scheduler/ipp.c.driverd-timeout cups-1.5.0/scheduler/ipp.c ---- cups-1.5.0/scheduler/ipp.c.driverd-timeout 2011-10-10 17:03:41.801690962 +0100 -+++ cups-1.5.0/scheduler/ipp.c 2011-10-10 17:03:41.861689834 +0100 -@@ -5723,7 +5723,7 @@ copy_model(cupsd_client_t *con, /* I - - close(temppipe[1]); - - /* -- * Wait up to 30 seconds for the PPD file to be copied... -+ * Wait up to 70 seconds for the PPD file to be copied... - */ - - total = 0; -@@ -5743,7 +5743,7 @@ copy_model(cupsd_client_t *con, /* I - - FD_SET(temppipe[0], &input); - FD_SET(CGIPipes[0], &input); - -- timeout.tv_sec = 30; -+ timeout.tv_sec = 70; - timeout.tv_usec = 0; - - if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) diff --git a/cups/patches/013_cups-strict-ppd-line-length.patch b/cups/patches/013_cups-strict-ppd-line-length.patch deleted file mode 100644 index b2697ec..0000000 --- a/cups/patches/013_cups-strict-ppd-line-length.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up cups-1.5b1/cups/ppd.c.strict-ppd-line-length cups-1.5b1/cups/ppd.c ---- cups-1.5b1/cups/ppd.c.strict-ppd-line-length 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/cups/ppd.c 2011-05-24 15:46:13.000000000 +0200 -@@ -2786,7 +2786,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - *lineptr++ = ch; - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2847,7 +2847,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2906,7 +2906,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... diff --git a/cups/patches/014_cups-logrotate.patch b/cups/patches/014_cups-logrotate.patch deleted file mode 100644 index a6485a9..0000000 --- a/cups/patches/014_cups-logrotate.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up cups-1.5b1/scheduler/log.c.logrotate cups-1.5b1/scheduler/log.c ---- cups-1.5b1/scheduler/log.c.logrotate 2011-05-14 01:04:16.000000000 +0200 -+++ cups-1.5b1/scheduler/log.c 2011-05-24 15:47:20.000000000 +0200 -@@ -32,6 +32,9 @@ - #include "cupsd.h" - #include <stdarg.h> - #include <syslog.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> - - - /* -@@ -71,12 +74,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - return (1); - - /* -- * Format the filename as needed... -+ * Format the filename... - */ - -- if (!*lf || -- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && -- MaxLogSize > 0)) -+ if (strncmp(logname, "/dev/", 5)) - { - /* - * Handle format strings... -@@ -186,6 +187,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - } - - /* -+ * Has someone else (i.e. logrotate) already rotated the log for us? -+ */ -+ else if (strncmp(filename, "/dev/", 5)) -+ { -+ struct stat st; -+ if (stat(filename, &st) || st.st_size == 0) -+ { -+ /* File is either missing or has zero size. */ -+ -+ cupsFileClose(*lf); -+ if ((*lf = cupsFileOpen(filename, "a")) == NULL) -+ { -+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, -+ strerror(errno)); -+ -+ return (0); -+ } -+ -+ /* -+ * Change ownership and permissions of non-device logs... -+ */ -+ -+ fchown(cupsFileNumber(*lf), RunUser, Group); -+ fchmod(cupsFileNumber(*lf), LogFilePerm); -+ } -+ } -+ -+ /* - * Do we need to rotate the log? - */ - diff --git a/cups/patches/015_cups-usb-paperout.patch b/cups/patches/015_cups-usb-paperout.patch deleted file mode 100644 index f1f73f0..0000000 --- a/cups/patches/015_cups-usb-paperout.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c ---- cups-1.5b1/backend/usb-unix.c.usb-paperout 2011-05-24 15:51:39.000000000 +0200 -+++ cups-1.5b1/backend/usb-unix.c 2011-05-24 15:51:39.000000000 +0200 -@@ -30,6 +30,11 @@ - - #include <sys/select.h> - -+#ifdef __linux -+#include <sys/ioctl.h> -+#include <linux/lp.h> -+#endif /* __linux */ -+ - - /* - * Local functions... -@@ -334,7 +339,19 @@ open_device(const char *uri, /* I - Dev - if (!strncmp(uri, "usb:/dev/", 9)) - #ifdef __linux - { -- return (open(uri + 4, O_RDWR | O_EXCL)); -+ fd = open(uri + 4, O_RDWR | O_EXCL); -+ -+ if (fd != -1) -+ { -+ /* -+ * Tell the driver to return from write() with errno==ENOSPACE -+ * on paper-out. -+ */ -+ unsigned int t = 1; -+ ioctl (fd, LPABORT, &t); -+ } -+ -+ return fd; - } - else if (!strncmp(uri, "usb://", 6)) - { -@@ -400,7 +417,14 @@ open_device(const char *uri, /* I - Dev - if (!strcmp(uri, device_uri)) - { - /* -- * Yes, return this file descriptor... -+ * Yes, tell the driver to return from write() with -+ * errno==ENOSPACE on paper-out. -+ */ -+ unsigned int t = 1; -+ ioctl (fd, LPABORT, &t); -+ -+ /* -+ * Return this file descriptor... - */ - - fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", diff --git a/cups/patches/016_cups-res_init.patch b/cups/patches/016_cups-res_init.patch deleted file mode 100644 index 94a81a4..0000000 --- a/cups/patches/016_cups-res_init.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c ---- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200 -+++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200 -@@ -254,7 +254,8 @@ httpAddrLookup( - - if (error) - { -- if (error == EAI_FAIL) -+ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || -+ error == EAI_NONAME) - cg->need_res_init = 1; - - return (httpAddrString(addr, name, namelen)); -diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c ---- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200 -@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /* - } - else - { -- if (error == EAI_FAIL) -+ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || -+ error == EAI_NONAME) - cg->need_res_init = 1; - - _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); diff --git a/cups/patches/017_cups-filter-debug.patch b/cups/patches/017_cups-filter-debug.patch deleted file mode 100644 index 96c82da..0000000 --- a/cups/patches/017_cups-filter-debug.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up cups-1.6b1/scheduler/job.c.filter-debug cups-1.6b1/scheduler/job.c ---- cups-1.6b1/scheduler/job.c.filter-debug 2012-05-25 16:06:01.000000000 +0200 -+++ cups-1.6b1/scheduler/job.c 2012-05-25 16:07:46.309259511 +0200 -@@ -625,10 +625,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - - if (!filters) - { -+ mime_filter_t *current; -+ - cupsdLogJob(job, CUPSD_LOG_ERROR, - "Unable to convert file %d to printable format.", - job->current_file); - -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Required: %s/%s -> %s/%s", -+ job->filetypes[job->current_file]->super, -+ job->filetypes[job->current_file]->type, -+ job->printer->filetype->super, -+ job->printer->filetype->type); -+ -+ for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs); -+ current; -+ current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs)) -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Available: %s/%s -> %s/%s (%s)", -+ current->src->super, current->src->type, -+ current->dst->super, current->dst->type, -+ current->filter); -+ - abort_message = "Aborting job because it cannot be printed."; - abort_state = IPP_JOB_ABORTED; - diff --git a/cups/patches/018_cups-uri-compat.patch b/cups/patches/018_cups-uri-compat.patch deleted file mode 100644 index 2520a5b..0000000 --- a/cups/patches/018_cups-uri-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c ---- cups-1.5b1/backend/usb-unix.c.uri-compat 2011-05-24 15:59:05.000000000 +0200 -+++ cups-1.5b1/backend/usb-unix.c 2011-05-24 16:02:03.000000000 +0200 -@@ -63,11 +63,34 @@ print_device(const char *uri, /* I - De - int device_fd; /* USB device */ - ssize_t tbytes; /* Total number of bytes written */ - struct termios opts; /* Parallel port options */ -+ char *fixed_uri = strdup (uri); -+ char *p; - - - (void)argc; - (void)argv; - -+ p = strchr (fixed_uri, ':'); -+ if (p++ != NULL) -+ { -+ char *e; -+ p += strspn (p, "/"); -+ e = strchr (p, '/'); -+ if (e > p) -+ { -+ size_t mfrlen = e - p; -+ e++; -+ if (!strncasecmp (e, p, mfrlen)) -+ { -+ char *x = e + mfrlen; -+ if (!strncmp (x, "%20", 3)) -+ /* Take mfr name out of mdl name for compatibility with -+ * Fedora 11 before bug #507244 was fixed. */ -+ strcpy (e, x + 3); puts(fixed_uri); -+ } -+ } -+ } -+ - /* - * Open the USB port device... - */ -@@ -107,10 +130,10 @@ print_device(const char *uri, /* I - De - _cups_strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -- if (use_bc && !strncmp(uri, "usb:/dev/", 9)) -+ if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9)) - use_bc = 0; - -- if ((device_fd = open_device(uri, &use_bc)) == -1) -+ if ((device_fd = open_device(fixed_uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) - { diff --git a/cups/patches/019_cups-cups-get-classes.patch b/cups/patches/019_cups-cups-get-classes.patch deleted file mode 100644 index b0ffe1c..0000000 --- a/cups/patches/019_cups-cups-get-classes.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -up cups-1.5.0/cups/dest.c.cups-get-classes cups-1.5.0/cups/dest.c ---- cups-1.5.0/cups/dest.c.cups-get-classes 2011-05-20 04:49:49.000000000 +0100 -+++ cups-1.5.0/cups/dest.c 2011-09-14 12:10:05.111635428 +0100 -@@ -534,6 +534,7 @@ _cupsGetDests(http_t *http, /* I - - char uri[1024]; /* printer-uri value */ - int num_options; /* Number of options */ - cups_option_t *options; /* Options */ -+ int get_classes; /* Whether we need to fetch class */ - #ifdef __APPLE__ - char media_default[41]; /* Default paper size */ - #endif /* __APPLE__ */ -@@ -590,6 +591,8 @@ _cupsGetDests(http_t *http, /* I - - * printer-uri [for IPP_GET_PRINTER_ATTRIBUTES] - */ - -+ get_classes = (op == CUPS_GET_PRINTERS); -+ - request = ippNewRequest(op); - - ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, -@@ -647,6 +650,23 @@ _cupsGetDests(http_t *http, /* I - - attr->value_tag != IPP_TAG_URI) - continue; - -+ if (get_classes && -+ -+ /* Is this a class? */ -+ ((attr->value_tag == IPP_TAG_ENUM && -+ !strcmp(attr->name, "printer-type") && -+ (attr->values[0].integer & CUPS_PRINTER_CLASS)) || -+ -+ /* Or, is this an attribute from CUPS 1.2 or later? */ -+ !strcmp(attr->name, "auth-info-required") || -+ !strncmp(attr->name, "marker-", 7) || -+ !strcmp(attr->name, "printer-commands") || -+ !strcmp(attr->name, "printer-is-shared"))) -+ /* We are talking to a recent enough CUPS server that -+ * CUPS_GET_PRINTERS returns classes as well. -+ */ -+ get_classes = 0; -+ - if (!strcmp(attr->name, "auth-info-required") || - !strcmp(attr->name, "device-uri") || - !strcmp(attr->name, "marker-change-time") || -@@ -738,6 +758,28 @@ _cupsGetDests(http_t *http, /* I - - continue; - } - -+ /* -+ * If we sent a CUPS_GET_CLASSES request, check whether -+ * CUPS_GET_PRINTERS already gave us this destination and exit -+ * early if so. -+ */ -+ -+ if (op == CUPS_GET_CLASSES && num_dests > 0) -+ { -+ int diff; -+ cups_find_dest (printer_name, NULL, num_dests, *dests, 0, &diff); -+ if (diff == 0) -+ { -+ /* -+ * Found it. The CUPS server already gave us the classes in -+ * its CUPS_GET_PRINTERS response. -+ */ -+ -+ cupsFreeOptions(num_options, options); -+ break; -+ } -+ } -+ - if ((dest = cups_add_dest(printer_name, NULL, &num_dests, dests)) != NULL) - { - dest->num_options = num_options; -@@ -754,6 +796,15 @@ _cupsGetDests(http_t *http, /* I - - } - - /* -+ * If this is a CUPS_GET_PRINTERS request but we didn't see any -+ * classes we might be talking to an older CUPS server that requires -+ * CUPS_GET_CLASSES as well. -+ */ -+ -+ if (get_classes) -+ num_dests = _cupsGetDests (http, CUPS_GET_CLASSES, name, dests, 0, 0); -+ -+ /* - * Return the count... - */ - diff --git a/cups/patches/020_cups-str3382.patch b/cups/patches/020_cups-str3382.patch deleted file mode 100644 index 2e8736d..0000000 --- a/cups/patches/020_cups-str3382.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up cups-1.5b1/cups/tempfile.c.str3382 cups-1.5b1/cups/tempfile.c ---- cups-1.5b1/cups/tempfile.c.str3382 2010-03-24 01:45:34.000000000 +0100 -+++ cups-1.5b1/cups/tempfile.c 2011-05-24 16:04:47.000000000 +0200 -@@ -33,6 +33,7 @@ - # include <io.h> - #else - # include <unistd.h> -+# include <sys/types.h> - #endif /* WIN32 || __EMX__ */ - - -@@ -54,7 +55,7 @@ cupsTempFd(char *filename, /* I - Point - char tmppath[1024]; /* Windows temporary directory */ - DWORD curtime; /* Current time */ - #else -- struct timeval curtime; /* Current time */ -+ mode_t old_umask; /* Old umask before using mkstemp() */ - #endif /* WIN32 */ - - -@@ -105,33 +106,25 @@ cupsTempFd(char *filename, /* I - Point - - snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir, - GetCurrentProcessId(), curtime); --#else -- /* -- * Get the current time of day... -- */ -- -- gettimeofday(&curtime, NULL); -- -- /* -- * Format a string using the hex time values... -- */ -- -- snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(), -- (unsigned)(curtime.tv_sec + curtime.tv_usec + tries)); --#endif /* WIN32 */ - - /* - * Open the file in "exclusive" mode, making sure that we don't - * stomp on an existing file or someone's symlink crack... - */ - --#ifdef WIN32 - fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY, - _S_IREAD | _S_IWRITE); --#elif defined(O_NOFOLLOW) -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); - #else -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); -+ -+ /* -+ * Use the standard mkstemp() call to make a temporary filename -+ * securely. -- andrew.wood(a)jdplc.com -+ */ -+ snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir); -+ -+ old_umask = umask(0077); -+ fd = mkstemp(filename); -+ umask(old_umask); - #endif /* WIN32 */ - - if (fd < 0 && errno != EEXIST) diff --git a/cups/patches/021_cups-0755.patch b/cups/patches/021_cups-0755.patch deleted file mode 100644 index b0df3a0..0000000 --- a/cups/patches/021_cups-0755.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.6b1/Makedefs.in.0755 cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.0755 2012-05-23 01:58:31.000000000 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-25 16:09:40.545463214 +0200 -@@ -40,14 +40,14 @@ SHELL = /bin/sh - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ - INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ - INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ - INSTALL_DATA = $(INSTALL) -c -m 444 - INSTALL_DIR = $(INSTALL) -d --INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ - INSTALL_MAN = $(INSTALL) -c -m 444 --INSTALL_SCRIPT = $(INSTALL) -c -m 555 -+INSTALL_SCRIPT = $(INSTALL) -c -m 755 - - # - # Default user, group, and system groups for the scheduler... diff --git a/cups/patches/022_cups-hp-deviceid-oid.patch b/cups/patches/022_cups-hp-deviceid-oid.patch deleted file mode 100644 index da5136a..0000000 --- a/cups/patches/022_cups-hp-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.5b1/backend/snmp.c.hp-deviceid-oid cups-1.5b1/backend/snmp.c ---- cups-1.5b1/backend/snmp.c.hp-deviceid-oid 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/backend/snmp.c 2011-05-24 17:24:48.000000000 +0200 -@@ -187,6 +187,7 @@ static const int UriOID[] = { CUPS_OID_p - static const int LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 }; - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; -+static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1006,6 +1007,9 @@ read_snmp_response(int fd) /* I - SNMP - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, HPDeviceIdOID); - break; - - case DEVICE_DESCRIPTION : diff --git a/cups/patches/023_cups-dnssd-deviceid.patch b/cups/patches/023_cups-dnssd-deviceid.patch deleted file mode 100644 index b3c2b8e..0000000 --- a/cups/patches/023_cups-dnssd-deviceid.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cups-1.6b1/backend/dnssd.c.dnssd-deviceid cups-1.6b1/backend/dnssd.c ---- cups-1.6b1/backend/dnssd.c.dnssd-deviceid 2012-05-21 18:05:58.000000000 +0200 -+++ cups-1.6b1/backend/dnssd.c 2012-05-25 16:27:49.226874427 +0200 -@@ -1181,15 +1181,22 @@ query_callback( - if (device->device_id) - free(device->device_id); - -+ if (device_id[0]) -+ { -+ /* Mark this as the real device ID. */ -+ ptr = device_id + strlen(device_id); -+ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); -+ } -+ - if (!device_id[0] && strcmp(model, "Unknown")) - { - if (make_and_model[0]) -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, model); - else if (!_cups_strncasecmp(model, "designjet ", 10)) -- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10); -+ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); - else if (!_cups_strncasecmp(model, "stylus ", 7)) -- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); -+ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); - else if ((ptr = strchr(model, ' ')) != NULL) - { - /* -@@ -1199,7 +1206,7 @@ query_callback( - memcpy(make_and_model, model, ptr - model); - make_and_model[ptr - model] = '\0'; - -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, ptr + 1); - } - } diff --git a/cups/patches/024_cups-ricoh-deviceid-oid.patch b/cups/patches/024_cups-ricoh-deviceid-oid.patch deleted file mode 100644 index c148f95..0000000 --- a/cups/patches/024_cups-ricoh-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid cups-1.5b1/backend/snmp.c ---- cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid 2011-05-24 17:29:48.000000000 +0200 -+++ cups-1.5b1/backend/snmp.c 2011-05-24 17:29:48.000000000 +0200 -@@ -188,6 +188,7 @@ static const int LexmarkProductOID[] = { - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; - static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; -+static const int RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1005,6 +1006,9 @@ read_snmp_response(int fd) /* I - SNMP - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_ID, LexmarkDeviceIdOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, RicohDeviceIdOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, diff --git a/cups/patches/025_cups-systemd-socket.patch b/cups/patches/025_cups-systemd-socket.patch deleted file mode 100644 index 83fabdb..0000000 --- a/cups/patches/025_cups-systemd-socket.patch +++ /dev/null @@ -1,395 +0,0 @@ -diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in ---- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 -+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 -@@ -506,6 +506,13 @@ - - - /* -+ * Do we have systemd support? -+ */ -+ -+#undef HAVE_SYSTEMD -+ -+ -+/* - * Various scripting languages... - */ - -diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 ---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 -+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 -@@ -0,0 +1,36 @@ -+dnl -+dnl "$Id$" -+dnl -+dnl systemd stuff for CUPS. -+ -+dnl Find whether systemd is available -+ -+SDLIBS="" -+AC_ARG_WITH([systemdsystemunitdir], -+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), -+ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)]) -+if test "x$with_systemdsystemunitdir" != xno; then -+ AC_MSG_CHECKING(for libsystemd-daemon) -+ if $PKGCONFIG --exists libsystemd-daemon; then -+ AC_MSG_RESULT(yes) -+ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` -+ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon` -+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -+ AC_DEFINE(HAVE_SYSTEMD) -+ else -+ AC_MSG_RESULT(no) -+ fi -+fi -+ -+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then -+ SYSTEMD_UNITS="cups.service cups.socket cups.path" -+else -+ SYSTEMD_UNITS="" -+fi -+ -+AC_SUBST(SYSTEMD_UNITS) -+AC_SUBST(SDLIBS) -+ -+dnl -+dnl "$Id$" -+dnl -diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in ---- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 -@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) - sinclude(config-scripts/cups-largefile.m4) - sinclude(config-scripts/cups-dnssd.m4) - sinclude(config-scripts/cups-launchd.m4) -+sinclude(config-scripts/cups-systemd.m4) - sinclude(config-scripts/cups-defaults.m4) - sinclude(config-scripts/cups-scripting.m4) - -@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs - conf/snmp.conf - cups-config - data/testprint -+ data/cups.service -+ data/cups.socket -+ data/cups.path - desktop/cups.desktop - doc/help/ref-cupsd-conf.html - doc/help/standard.html -diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c ---- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 -@@ -975,7 +975,7 @@ cups_read_client_conf( - struct stat sockinfo; /* Domain socket information */ - - if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && -- (sockinfo.st_mode & S_IRWXO) == S_IRWXO) -+ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH)) - cups_server = CUPS_DEFAULT_DOMAINSOCKET; - else - #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in ---- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 -@@ -0,0 +1,8 @@ -+[Unit] -+Description=CUPS Printer Service Spool -+ -+[Path] -+PathExistsGlob=@CUPS_REQUESTS@/d* -+ -+[Install] -+WantedBy=multi-user.target -diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in ---- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 -@@ -0,0 +1,10 @@ -+[Unit] -+Description=CUPS Printing Service -+ -+[Service] -+ExecStart=@sbindir@/cupsd -f -+PrivateTmp=true -+ -+[Install] -+Also=cups.socket cups.path -+WantedBy=printer.target -diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in ---- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 -+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 -@@ -0,0 +1,8 @@ -+[Unit] -+Description=CUPS Printing Service Sockets -+ -+[Socket] -+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -+ -+[Install] -+WantedBy=sockets.target -diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile ---- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 -+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 -@@ -100,6 +100,12 @@ install-data: - $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ - done - $(INSTALL_DIR) -m 755 $(DATADIR)/profiles -+ if test "x$(SYSTEMD_UNITS)" != "x" ; then \ -+ $(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \ -+ for file in $(SYSTEMD_UNITS); do \ -+ $(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \ -+ done; \ -+ fi - - - # -@@ -143,6 +149,9 @@ uninstall: - -$(RMDIR) $(DATADIR)/data - -$(RMDIR) $(DATADIR)/banners - -$(RMDIR) $(DATADIR) -+ for file in $(SYSTEMD_UNITS); do \ -+ $(RM) $(SYSTEMDUNITDIR)/$$file; \ -+ done - - - # -diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 -@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ - CXXLIBS = @CXXLIBS@ - DBUS_NOTIFIER = @DBUS_NOTIFIER@ - DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ -+SYSTEMD_UNITS = @SYSTEMD_UNITS@ - DNSSD_BACKEND = @DNSSD_BACKEND@ - DSOFLAGS = -L../cups @DSOFLAGS@ - DSOLIBS = @DSOLIBS@ $(COMMONLIBS) - DNSSDLIBS = @DNSSDLIBS@ - LAUNCHDLIBS = @LAUNCHDLIBS@ -+SDLIBS = @SDLIBS@ - LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ - -L../scheduler @LDARCHFLAGS@ \ - @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ - - DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ - DBUSDIR = @DBUSDIR@ -+SYSTEMDUNITDIR = $(BUILDROOT)@systemdsystemunitdir@ - - - # -diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h ---- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 -+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 -@@ -77,6 +77,9 @@ typedef struct - int fd; /* File descriptor for this server */ - http_addr_t address; /* Bind address of socket */ - http_encryption_t encryption; /* To encrypt or not to encrypt... */ -+#ifdef HAVE_SYSTEMD -+ int is_systemd; /* Is this a systemd socket? */ -+#endif /* HAVE_SYSTEMD */ - } cupsd_listener_t; - - -diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c ---- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 -+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 -@@ -401,7 +401,11 @@ cupsdStopListening(void) - lis; - lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) - { -- if (lis->fd != -1) -+ if (lis->fd != -1 -+#ifdef HAVE_SYSTEMD -+ && !lis->is_systemd -+#endif /* HAVE_SYSTEMD */ -+ ) - { - #ifdef WIN32 - closesocket(lis->fd); -diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c ---- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 -+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 -@@ -26,6 +26,8 @@ - * launchd_checkin() - Check-in with launchd and collect the listening - * fds. - * launchd_checkout() - Update the launchd KeepAlive file as needed. -+ * systemd_checkin() - Check-in with systemd and collect the -+ * listening fds. - * parent_handler() - Catch USR1/CHLD signals... - * process_children() - Process all dead children... - * select_timeout() - Calculate the select timeout value. -@@ -62,6 +64,10 @@ - # endif /* !LAUNCH_JOBKEY_SERVICEIPC */ - #endif /* HAVE_LAUNCH_H */ - -+#ifdef HAVE_SYSTEMD -+#include <systemd/sd-daemon.h> -+#endif /* HAVE_SYSTEMD */ -+ - #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) - # include <malloc.h> - #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -@@ -78,6 +84,9 @@ - static void launchd_checkin(void); - static void launchd_checkout(void); - #endif /* HAVE_LAUNCHD */ -+#ifdef HAVE_SYSTEMD -+static void systemd_checkin(void); -+#endif /* HAVE_SYSTEMD */ - static void parent_handler(int sig); - static void process_children(void); - static void sigchld_handler(int sig); -@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm - } - #endif /* HAVE_LAUNCHD */ - -+#ifdef HAVE_SYSTEMD -+ /* -+ * If we were started by systemd get the listen sockets file descriptors... -+ */ -+ systemd_checkin(); -+#endif /* HAVE_SYSTEMD */ -+ - /* - * Startup the server... - */ -@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm - } - #endif /* HAVE_LAUNCHD */ - -+#ifdef HAVE_SYSTEMD -+ /* -+ * If we were started by systemd get the listen sockets file -+ * descriptors... -+ */ -+ -+ systemd_checkin(); -+#endif /* HAVE_SYSTEMD */ -+ - /* - * Startup the server... - */ -@@ -1516,6 +1541,102 @@ launchd_checkout(void) - } - #endif /* HAVE_LAUNCHD */ - -+#ifdef HAVE_SYSTEMD -+static void -+systemd_checkin(void) -+{ -+ int n, fd; -+ -+ n = sd_listen_fds(0); -+ if (n < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Failed to acquire sockets from systemd - %s", -+ strerror(-n)); -+ exit(EXIT_FAILURE); -+ return; -+ } -+ -+ if (n == 0) -+ return; -+ -+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) -+ { -+ http_addr_t addr; -+ socklen_t addrlen = sizeof (addr); -+ int r; -+ cupsd_listener_t *lis; -+ char s[256]; -+ -+ r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1); -+ if (r < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Unable to verify socket type - %s", -+ strerror(-r)); -+ continue; -+ } -+ -+ if (!r) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Socket not of the right type"); -+ continue; -+ } -+ -+ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen)) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Unable to get local address - %s", -+ strerror(errno)); -+ continue; -+ } -+ -+ /* -+ * Try to match the systemd socket address to one of the listeners... -+ */ -+ -+ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners); -+ lis; -+ lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) -+ if (httpAddrEqual(&lis->address, &addr)) -+ break; -+ -+ if (lis) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "systemd_checkin: Matched existing listener %s with fd %d...", -+ httpAddrString(&(lis->address), s, sizeof(s)), fd); -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "systemd_checkin: Adding new listener %s with fd %d...", -+ httpAddrString(&addr, s, sizeof(s)), fd); -+ -+ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Unable to allocate listener - " -+ "%s.", strerror(errno)); -+ exit(EXIT_FAILURE); -+ } -+ -+ cupsArrayAdd(Listeners, lis); -+ -+ memcpy(&lis->address, &addr, sizeof(lis->address)); -+ } -+ -+ lis->fd = fd; -+ lis->is_systemd = 1; -+ -+# ifdef HAVE_SSL -+ if (_httpAddrPort(&(lis->address)) == 443) -+ lis->encryption = HTTP_ENCRYPT_ALWAYS; -+# endif /* HAVE_SSL */ -+ } -+} -+#endif /* HAVE_SYSTEMD */ - - /* - * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile ---- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 -+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 -@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu - $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ - $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ - $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ -- $(LIBGSSAPI) $(LIBWRAP) -+ $(LIBGSSAPI) $(LIBWRAP) $(SDLIBS) - - cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) - echo Linking $@... -@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a - $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ - ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ - $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ -- $(LIBWRAP) -+ $(LIBWRAP) $(SDLIBS) - - tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c - diff --git a/cups/patches/026_cups-lspp.patch b/cups/patches/026_cups-lspp.patch deleted file mode 100644 index d81ef06..0000000 --- a/cups/patches/026_cups-lspp.patch +++ /dev/null @@ -1,1999 +0,0 @@ -diff -up cups-1.6b1/config.h.in.lspp cups-1.6b1/config.h.in ---- cups-1.6b1/config.h.in.lspp 2012-05-25 17:01:32.000000000 +0200 -+++ cups-1.6b1/config.h.in 2012-05-25 17:03:16.889043298 +0200 -@@ -768,6 +768,13 @@ static __inline int _cups_abs(int i) { r - # endif /* __GNUC__ || __STDC_VERSION__ */ - #endif /* !HAVE_ABS && !abs */ - -+/* -+ * Are we trying to meet LSPP requirements? -+ */ -+ -+#undef WITH_LSPP -+ -+ - #endif /* !_CUPS_CONFIG_H_ */ - - /* -diff -up cups-1.6b1/config-scripts/cups-lspp.m4.lspp cups-1.6b1/config-scripts/cups-lspp.m4 ---- cups-1.6b1/config-scripts/cups-lspp.m4.lspp 2012-05-25 17:01:32.852768495 +0200 -+++ cups-1.6b1/config-scripts/cups-lspp.m4 2012-05-25 17:01:32.853768488 +0200 -@@ -0,0 +1,36 @@ -+dnl -+dnl LSPP code for the Common UNIX Printing System (CUPS). -+dnl -+dnl Copyright 2005-2006 by Hewlett-Packard Development Company, L.P. -+dnl -+dnl This program is free software; you can redistribute it and/or modify -+dnl it under the terms of the GNU General Public License as published by -+dnl the Free Software Foundation; version 2. -+dnl -+dnl This program is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU General Public License -+dnl along with this program; if not, write to the Free Software Foundation, -+dnl Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA -+dnl -+ -+dnl Are we trying to meet LSPP requirements -+AC_ARG_ENABLE(lspp, [ --enable-lspp turn on auditing and label support, default=no]) -+ -+if test x"$enable_lspp" != xno; then -+ case "$uname" in -+ Linux) -+ AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)]) -+ AC_CHECK_HEADER(libaudit.h) -+ AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)]) -+ AC_CHECK_HEADER(selinux/selinux.h) -+ AC_DEFINE(WITH_LSPP) -+ ;; -+ *) -+ # All others -+ ;; -+ esac -+fi -diff -up cups-1.6b1/configure.in.lspp cups-1.6b1/configure.in ---- cups-1.6b1/configure.in.lspp 2012-05-25 17:01:32.000000000 +0200 -+++ cups-1.6b1/configure.in 2012-05-25 17:04:03.994714943 +0200 -@@ -37,6 +37,8 @@ sinclude(config-scripts/cups-systemd.m4) - sinclude(config-scripts/cups-defaults.m4) - sinclude(config-scripts/cups-scripting.m4) - -+sinclude(config-scripts/cups-lspp.m4) -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" -diff -up cups-1.6b1/filter/common.c.lspp cups-1.6b1/filter/common.c ---- cups-1.6b1/filter/common.c.lspp 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.6b1/filter/common.c 2012-05-25 17:01:32.854768481 +0200 -@@ -30,6 +30,12 @@ - * Include necessary headers... - */ - -+#include "config.h" -+#ifdef WITH_LSPP -+#define _GNU_SOURCE -+#include <string.h> -+#endif /* WITH_LSPP */ -+ - #include "common.h" - #include <locale.h> - -@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label, /* I - { - const char *classification; /* CLASSIFICATION environment variable */ - const char *ptr; /* Temporary string pointer */ -+#ifdef WITH_LSPP -+ int i, /* counter */ -+ n, /* counter */ -+ lines, /* number of lines needed */ -+ line_len, /* index into tmp_label */ -+ label_len, /* length of the label in characters */ -+ label_index, /* index into the label */ -+ longest, /* length of the longest line */ -+ longest_line, /* index to the longest line */ -+ max_width; /* maximum width in characters */ -+ char **wrapped_label; /* label with line breaks */ -+#endif /* WITH_LSPP */ - - - /* -@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label, /* I - return; - } - -+#ifdef WITH_LSPP -+ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) -+ { -+ /* -+ * Based on the 12pt fixed width font below determine the max_width -+ */ -+ max_width = width / 8; -+ longest_line = 0; -+ longest = 0; -+ classification += 5; // Skip the "LSPP:" -+ label_len = strlen(classification); -+ -+ if (label_len > max_width) -+ { -+ lines = 1 + (int)(label_len / max_width); -+ line_len = (int)(label_len / lines); -+ wrapped_label = malloc(sizeof(*wrapped_label) * lines); -+ label_index = i = n = 0; -+ while (classification[label_index]) -+ { -+ if ((label_index + line_len) > label_len) -+ break; -+ switch (classification[label_index + line_len + i]) -+ { -+ case ':': -+ case ',': -+ case '-': -+ i++; -+ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); -+ label_index += line_len + i; -+ i = 0; -+ break; -+ default: -+ i++; -+ break; -+ } -+ if ((i + line_len) == max_width) -+ { -+ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); -+ label_index = label_index + line_len + i; -+ i = 0; -+ } -+ } -+ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); -+ } -+ else -+ { -+ lines = 1; -+ wrapped_label = malloc(sizeof(*wrapped_label)); -+ wrapped_label[0] = (char*)classification; -+ } -+ -+ for (n = 0; n < lines; n++ ) -+ { -+ printf("userdict/ESPp%c(", ('a' + n)); -+ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) -+ if (*ptr < 32 || *ptr > 126) -+ printf("\\%03o", *ptr); -+ else -+ { -+ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') -+ putchar('\\'); -+ -+ printf("%c", *ptr); -+ } -+ if (i > longest) -+ { -+ longest = i; -+ longest_line = n; -+ } -+ printf(")put\n"); -+ } -+ -+ /* -+ * For LSPP use a fixed width font so that line wrapping can be calculated -+ */ -+ -+ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); -+ -+ /* -+ * Finally, the procedure to write the labels on the page... -+ */ -+ -+ printf("userdict/ESPwl{\n" -+ " ESPlf setfont\n"); -+ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", -+ 'a' + longest_line, width * 0.5f); -+ for (n = 1; n < lines; n++) -+ printf(" dup"); -+ printf("\n 1 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ printf(" 0 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ for (n = 0; n < lines; n ++) -+ { -+ printf(" dup %.0f moveto ESPp%c show\n", -+ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); -+ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); -+ } -+ printf(" pop\n" -+ "}bind put\n"); -+ -+ /* -+ * Do some clean up at the end of the LSPP special case -+ */ -+ free(wrapped_label); -+ -+ } -+ else -+ { -+#endif /* !WITH_LSPP */ -+ - /* - * Set the classification + page label string... - */ -@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label, /* I - printf(" %.0f moveto ESPpl show\n", top - 14.0); - puts("pop"); - puts("}bind put"); -+ } -+#ifdef WITH_LSPP - } -+#endif /* WITH_LSPP */ - - - /* -diff -up cups-1.6b1/filter/pstops.c.lspp cups-1.6b1/filter/pstops.c ---- cups-1.6b1/filter/pstops.c.lspp 2012-04-23 21:19:19.000000000 +0200 -+++ cups-1.6b1/filter/pstops.c 2012-05-25 17:01:32.855768474 +0200 -@@ -3202,6 +3202,18 @@ write_label_prolog(pstops_doc_t *doc, /* - { - const char *classification; /* CLASSIFICATION environment variable */ - const char *ptr; /* Temporary string pointer */ -+#ifdef WITH_LSPP -+ int i, /* counter */ -+ n, /* counter */ -+ lines, /* number of lines needed */ -+ line_len, /* index into tmp_label */ -+ label_len, /* length of the label in characters */ -+ label_index, /* index into the label */ -+ longest, /* length of the longest line */ -+ longest_line, /* index to the longest line */ -+ max_width; /* maximum width in characters */ -+ char **wrapped_label; /* label with line breaks */ -+#endif /* WITH_LSPP */ - - - /* -@@ -3224,6 +3236,124 @@ write_label_prolog(pstops_doc_t *doc, /* - return; - } - -+#ifdef WITH_LSPP -+ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) -+ { -+ /* -+ * Based on the 12pt fixed width font below determine the max_width -+ */ -+ max_width = width / 8; -+ longest_line = 0; -+ longest = 0; -+ classification += 5; // Skip the "LSPP:" -+ label_len = strlen(classification); -+ -+ if (label_len > max_width) -+ { -+ lines = 1 + (int)(label_len / max_width); -+ line_len = (int)(label_len / lines); -+ wrapped_label = malloc(sizeof(*wrapped_label) * lines); -+ label_index = i = n = 0; -+ while (classification[label_index]) -+ { -+ if ((label_index + line_len) > label_len) -+ break; -+ switch (classification[label_index + line_len + i]) -+ { -+ case ':': -+ case ',': -+ case '-': -+ i++; -+ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); -+ label_index += line_len + i; -+ i = 0; -+ break; -+ default: -+ i++; -+ break; -+ } -+ if ((i + line_len) == max_width) -+ { -+ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); -+ label_index = label_index + line_len + i; -+ i = 0; -+ } -+ } -+ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); -+ } -+ else -+ { -+ lines = 1; -+ wrapped_label = malloc(sizeof(*wrapped_label)); -+ wrapped_label[0] = (char*)classification; -+ } -+ -+ for (n = 0; n < lines; n++ ) -+ { -+ printf("userdict/ESPp%c(", ('a' + n)); -+ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) -+ if (*ptr < 32 || *ptr > 126) -+ printf("\\%03o", *ptr); -+ else -+ { -+ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') -+ putchar('\\'); -+ -+ printf("%c", *ptr); -+ } -+ if (i > longest) -+ { -+ longest = i; -+ longest_line = n; -+ } -+ printf(")put\n"); -+ } -+ -+ /* -+ * For LSPP use a fixed width font so that line wrapping can be calculated -+ */ -+ -+ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); -+ -+ /* -+ * Finally, the procedure to write the labels on the page... -+ */ -+ -+ printf("userdict/ESPwl{\n" -+ " ESPlf setfont\n"); -+ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", -+ 'a' + longest_line, width * 0.5f); -+ for (n = 1; n < lines; n++) -+ printf(" dup"); -+ printf("\n 1 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ printf(" 0 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ for (n = 0; n < lines; n ++) -+ { -+ printf(" dup %.0f moveto ESPp%c show\n", -+ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); -+ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); -+ } -+ printf(" pop\n" -+ "}bind put\n"); -+ -+ /* -+ * Do some clean up at the end of the LSPP special case -+ */ -+ free(wrapped_label); -+ -+ } -+ else -+ { -+#endif /* !WITH_LSPP */ -+ - /* - * Set the classification + page label string... - */ -@@ -3302,7 +3432,10 @@ write_label_prolog(pstops_doc_t *doc, /* - doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); - doc_puts(doc, "pop\n"); - doc_puts(doc, "}bind put\n"); -+ } -+#ifdef WITH_LSPP - } -+#endif /* WITH_LSPP */ - - - /* -diff -up cups-1.6b1/Makedefs.in.lspp cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.lspp 2012-05-25 17:01:32.000000000 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-25 17:07:57.325088484 +0200 -@@ -146,7 +146,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f - @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ --LIBS = $(LINKCUPS) $(COMMONLIBS) -+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ - OPTIM = @OPTIM@ - OPTIONS = - PAMLIBS = @PAMLIBS@ -diff -up cups-1.6b1/scheduler/client.c.lspp cups-1.6b1/scheduler/client.c ---- cups-1.6b1/scheduler/client.c.lspp 2012-05-08 00:41:30.000000000 +0200 -+++ cups-1.6b1/scheduler/client.c 2012-05-25 17:13:38.947707163 +0200 -@@ -41,6 +41,7 @@ - * valid_host() - Is the Host: field valid? - * write_file() - Send a file via HTTP. - * write_pipe() - Flag that data is available on the CGI pipe. -+ * client_pid_to_auid() - Get the audit login uid of the client. - */ - - /* -@@ -49,10 +50,16 @@ - - #include "cupsd.h" - -+#define _GNU_SOURCE - #ifdef HAVE_TCPD_H - # include <tcpd.h> - #endif /* HAVE_TCPD_H */ - -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <fcntl.h> -+#endif /* WITH_LSPP */ - - /* - * Local globals... -@@ -371,6 +378,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) - } - #endif /* HAVE_TCPD_H */ - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ struct ucred cr; -+ unsigned int cl=sizeof(cr); -+ -+ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) -+ { -+ /* -+ * client_pid_to_auid() can be racey -+ * In this case the pid is based on a socket connected to the client -+ */ -+ if ((con->auid = client_pid_to_auid(cr.pid)) == -1) -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: " -+ "unable to determine client auid for client pid=%d", cr.pid); -+ free(con); -+ return; -+ } -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", -+ cr.pid, cr.uid, cr.gid, con->auid); -+ } -+ else -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); -+ free(con); -+ return; -+ } -+ -+ /* -+ * get the context of the peer connection -+ */ -+ if (getpeercon(con->http.fd, &con->scon)) -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); -+ free(con); -+ return; -+ } -+ -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()"); -+ cupsdSetString(&con->scon, UNKNOWN_SL); -+ } -+#endif /* WITH_LSPP */ -+ - #ifdef AF_LOCAL - if (con->http.hostaddr->addr.sa_family == AF_LOCAL) - cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] Accepted from %s (Domain)", -@@ -678,6 +736,13 @@ cupsdReadClient(cupsd_client_t *con) /* - mime_type_t *type; /* MIME type of file */ - cupsd_printer_t *p; /* Printer */ - static unsigned request_id = 0; /* Request ID for temp files */ -+#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job file */ -+ context_t clicon; /* contex_t container for con->scon */ -+ context_t tmpcon; /* temp context to swap the level */ -+ char *clirange; /* SELinux sensitivity range */ -+ char *cliclearance; /* SELinux low end clearance */ -+#endif /* WITH_LSPP */ - - - status = HTTP_CONTINUE; -@@ -2126,6 +2191,67 @@ cupsdReadClient(cupsd_client_t *con) /* - fchmod(con->file, 0640); - fchown(con->file, RunUser, Group); - fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); -+#ifdef WITH_LSPP -+ if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(con->filename, &spoolcon) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ return (cupsdCloseClient(con)); -+ } -+ clicon = context_new(con->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!clicon || !tmpcon) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ if (clicon) -+ context_free(clicon); -+ if (tmpcon) -+ context_free(tmpcon); -+ return (cupsdCloseClient(con)); -+ } -+ clirange = context_range_get(clicon); -+ if (clirange) -+ { -+ clirange = strdup(clirange); -+ if ((cliclearance = strtok(clirange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, cliclearance) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ free(clirange); -+ } -+ if (setfilecon(con->filename, context_str(tmpcon)) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", -+ con->filename, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(clicon); -+ } -+#endif /* WITH_LSPP */ - } - - if (con->http.state != HTTP_POST_SEND) -@@ -3581,6 +3707,49 @@ is_path_absolute(const char *path) /* I - return (1); - } - -+#ifdef WITH_LSPP -+/* -+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. -+ */ -+ -+uid_t client_pid_to_auid(pid_t clipid) -+{ -+ uid_t uid; -+ int len, in; -+ char buf[16] = {0}; -+ char fname[32] = {0}; -+ -+ -+ /* -+ * Hopefully this pid is still the one we are interested in. -+ */ -+ snprintf(fname, 32, "/proc/%d/loginuid", clipid); -+ in = open(fname, O_NOFOLLOW|O_RDONLY); -+ -+ if (in < 0) -+ return -1; -+ -+ errno = 0; -+ -+ do { -+ len = read(in, buf, sizeof(buf)); -+ } while (len < 0 && errno == EINTR); -+ -+ close(in); -+ -+ if (len < 0 || len >= sizeof(buf)) -+ return -1; -+ -+ errno = 0; -+ buf[len] = 0; -+ uid = strtol(buf, 0, 10); -+ -+ if (errno != 0) -+ return -1; -+ else -+ return uid; -+} -+#endif /* WITH_LSPP */ - - /* - * 'pipe_command()' - Pipe the output of a command to the remote client. -diff -up cups-1.6b1/scheduler/client.h.lspp cups-1.6b1/scheduler/client.h ---- cups-1.6b1/scheduler/client.h.lspp 2012-05-25 17:01:32.847768530 +0200 -+++ cups-1.6b1/scheduler/client.h 2012-05-25 17:14:12.963470050 +0200 -@@ -18,6 +18,13 @@ - #endif /* HAVE_AUTHORIZATION_H */ - - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#endif /* WITH_LSPP */ -+ - /* - * HTTP client structure... - */ -@@ -63,6 +70,10 @@ struct cupsd_client_s - #ifdef HAVE_AUTHORIZATION_H - AuthorizationRef authref; /* Authorization ref */ - #endif /* HAVE_AUTHORIZATION_H */ -+#ifdef WITH_LSPP -+ security_context_t scon; /* Security context of connection */ -+ uid_t auid; /* Audit loginuid of the client */ -+#endif /* WITH_LSPP */ - }; - - #define HTTP(con) &((con)->http) -@@ -135,6 +146,9 @@ extern void cupsdStartListening(void); - extern void cupsdStopListening(void); - extern void cupsdUpdateCGI(void); - extern void cupsdWriteClient(cupsd_client_t *con); -+#ifdef WITH_LSPP -+extern uid_t client_pid_to_auid(pid_t clipid); -+#endif /* WITH_LSPP */ - - #ifdef HAVE_SSL - extern int cupsdEndTLS(cupsd_client_t *con); -diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c ---- cups-1.6b1/scheduler/conf.c.lspp 2012-05-25 17:01:32.778769011 +0200 -+++ cups-1.6b1/scheduler/conf.c 2012-05-25 17:01:32.860768439 +0200 -@@ -32,6 +32,7 @@ - * read_location() - Read a <Location path> definition. - * read_policy() - Read a <Policy name> definition. - * set_policy_defaults() - Set default policy values as needed. -+ * is_lspp_config() - Is the system configured for LSPP - */ - - /* -@@ -57,6 +58,9 @@ - # define INADDR_NONE 0xffffffff - #endif /* !INADDR_NONE */ - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+#endif /* WITH_LSPP */ - - /* - * Configuration variable structure... -@@ -164,6 +168,10 @@ static const cupsd_var_t variables[] = - # if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS) - { "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME }, - # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ -+#ifdef WITH_LSPP -+ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, -+ { "PerPageLabels", &PerPageLabels, CUPSD_VARTYPE_BOOLEAN }, -+#endif /* WITH_LSPP */ - #endif /* HAVE_SSL */ - { "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, - { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME }, -@@ -537,6 +545,9 @@ cupsdReadConfiguration(void) - const char *tmpdir; /* TMPDIR environment variable */ - struct stat tmpinfo; /* Temporary directory info */ - cupsd_policy_t *p; /* Policy */ -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+#endif /* WITH_LSPP */ - - - /* -@@ -801,6 +812,25 @@ cupsdReadConfiguration(void) - - RunUser = getuid(); - -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ /* -+ * ClassifyOverride is set during read_configuration, if its ON, report it now -+ */ -+ if (ClassifyOverride) -+ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, -+ "[Config] ClassifyOverride=enabled Users can override print banners", -+ ServerName, NULL, NULL, 1); -+ /* -+ * PerPageLabel is set during read_configuration, if its OFF, report it now -+ */ -+ if (!PerPageLabels) -+ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, -+ "[Config] PerPageLabels=disabled", ServerName, NULL, NULL, 1); -+ } -+#endif /* WITH_LSPP */ -+ - cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", - RemotePort ? "enabled" : "disabled"); - -@@ -1185,7 +1215,19 @@ cupsdReadConfiguration(void) - cupsdClearString(&Classification); - - if (Classification) -+ { - cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+#endif /* WITH_LSPP */ -+ } - - /* - * Check the MaxClients setting, and then allocate memory for it... -@@ -3423,6 +3465,18 @@ read_location(cups_file_t *fp, /* I - C - return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); - } - -+#ifdef WITH_LSPP -+int is_lspp_config() -+{ -+ if (Classification != NULL) -+ return ((_cups_strcasecmp(Classification, MLS_CONFIG) == 0) -+ || (_cups_strcasecmp(Classification, TE_CONFIG) == 0) -+ || (_cups_strcasecmp(Classification, SELINUX_CONFIG) == 0)); -+ else -+ return 0; -+} -+#endif /* WITH_LSPP */ -+ - - /* - * 'read_policy()' - Read a <Policy name> definition. -diff -up cups-1.6b1/scheduler/conf.h.lspp cups-1.6b1/scheduler/conf.h ---- cups-1.6b1/scheduler/conf.h.lspp 2012-05-25 17:01:32.000000000 +0200 -+++ cups-1.6b1/scheduler/conf.h 2012-05-25 17:16:20.522580884 +0200 -@@ -247,6 +247,13 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NO - /* SSL/TLS options */ - #endif /* HAVE_SSL */ - -+#ifdef WITH_LSPP -+VAR int AuditLog VALUE(-1), -+ /* File descriptor for audit */ -+ PerPageLabels VALUE(TRUE); -+ /* Put the label on each page */ -+#endif /* WITH_LSPP */ -+ - #ifdef HAVE_LAUNCHD - VAR int LaunchdTimeout VALUE(10); - /* Time after which an idle cupsd will exit */ -@@ -265,6 +272,9 @@ int HaveServerCreds VALUE(0); - gss_cred_id_t ServerCreds; /* Server's GSS credentials */ - #endif /* HAVE_GSSAPI */ - -+#ifdef WITH_LSPP -+extern int is_lspp_config(void); -+#endif /* WITH_LSPP */ - - /* - * Prototypes... -diff -up cups-1.6b1/scheduler/cupsd.h.lspp cups-1.6b1/scheduler/cupsd.h ---- cups-1.6b1/scheduler/cupsd.h.lspp 2012-05-21 19:40:22.000000000 +0200 -+++ cups-1.6b1/scheduler/cupsd.h 2012-05-25 17:01:32.861768432 +0200 -@@ -13,6 +13,8 @@ - * file is missing or damaged, see the license at "http://www.cups.org/". - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ - - /* - * Include necessary headers. -@@ -37,13 +39,20 @@ - # include <unistd.h> - #endif /* WIN32 */ - -+#include "config.h" -+#ifdef WITH_LSPP -+# define MLS_CONFIG "mls" -+# define TE_CONFIG "te" -+# define SELINUX_CONFIG "SELinux" -+# define UNKNOWN_SL "UNKNOWN SL" -+#endif /* WITH_LSPP */ -+ - #include "mime.h" - - #if defined(HAVE_CDSASSL) - # include <CoreFoundation/CoreFoundation.h> - #endif /* HAVE_CDSASSL */ - -- - /* - * Some OS's don't have hstrerror(), most notably Solaris... - */ -diff -up cups-1.6b1/scheduler/ipp.c.lspp cups-1.6b1/scheduler/ipp.c ---- cups-1.6b1/scheduler/ipp.c.lspp 2012-05-25 17:01:32.810768787 +0200 -+++ cups-1.6b1/scheduler/ipp.c 2012-05-25 17:18:06.620841313 +0200 -@@ -35,6 +35,7 @@ - * cancel_all_jobs() - Cancel all or selected print jobs. - * cancel_job() - Cancel a print job. - * cancel_subscription() - Cancel a subscription. -+ * check_context() - Check the SELinux context for a user and job - * check_rss_recipient() - Check that we do not have a duplicate RSS - * feed URI. - * check_quotas() - Check quotas for a printer and user. -@@ -99,6 +100,9 @@ - * validate_user() - Validate the user for the request. - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -122,6 +126,14 @@ extern int mbr_check_membership_by_id(uu - # endif /* HAVE_MEMBERSHIPPRIV_H */ - #endif /* __APPLE__ */ - -+#ifdef WITH_LSPP -+#include <libaudit.h> -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <selinux/avc.h> -+#include <selinux/flask.h> -+#include <selinux/av_permissions.h> -+#endif /* WITH_LSPP */ - - /* - * Local functions... -@@ -146,6 +158,9 @@ static void cancel_all_jobs(cupsd_client - static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); - static void cancel_subscription(cupsd_client_t *con, int id); - static int check_rss_recipient(const char *recipient); -+#ifdef WITH_LSPP -+static int check_context(cupsd_client_t *con, cupsd_job_t *job); -+#endif /* WITH_LSPP */ - static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); - static void close_job(cupsd_client_t *con, ipp_attribute_t *uri); - static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra, -@@ -1285,6 +1300,21 @@ add_job(cupsd_client_t *con, /* I - Cl - ipp_attribute_t *media_col, /* media-col attribute */ - *media_margin; /* media-*-margin attribute */ - ipp_t *unsup_col; /* media-col in unsupported response */ -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+ char *printerfile; /* device file pointed to by the printer */ -+ char *userheader = NULL; /* User supplied job-sheets[0] */ -+ char *userfooter = NULL; /* User supplied job-sheets[1] */ -+ int override = 0; /* Was a banner overrode on a job */ -+ security_id_t clisid; /* SELinux SID for the client */ -+ security_id_t psid; /* SELinux SID for the printer */ -+ context_t printercon; /* Printer's context string */ -+ struct stat printerstat; /* Printer's stat buffer */ -+ security_context_t devcon; /* Printer's SELinux context */ -+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ -+ security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1542,6 +1572,106 @@ add_job(cupsd_client_t *con, /* I - Cl - ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, - "Untitled"); - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ if (!con->scon || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: missing classification for connection \'%s\'!", printer->name); -+ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Missing required security attributes.")); -+ return (NULL); -+ } -+ -+ /* -+ * Perform an access check so that if the user gets feedback at enqueue time -+ */ -+ -+ printerfile = strstr(printer->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) -+ printerfile = printer->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s", -+ printerfile); -+ -+ if (lstat(printerfile, &printerstat) < 0) -+ { -+ if (errno != ENOENT) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to stat the printer")); -+ return (NULL); -+ } -+ /* -+ * The printer does not exist, so for now assume it's a FileDevice -+ */ -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else if (S_ISCHR(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_CHR_FILE; -+ avr = CHR_FILE__WRITE; -+ } -+ else if (S_ISREG(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file")); -+ return (NULL); -+ } -+ static avc_initialized = 0; -+ if (!avc_initialized++) -+ avc_init("cupsd_enqueue_", NULL, NULL, NULL, NULL); -+ avc_entry_ref_init(&avcref); -+ if (avc_context_to_sid(con->scon, &clisid) != 0) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the client")); -+ return (NULL); -+ } -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux context of the printer")); -+ return (NULL); -+ } -+ printercon = context_new(devcon); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: printer context %s client context %s", -+ context_str(printercon), con->scon); -+ context_free(printercon); -+ -+ if (avc_context_to_sid(devcon, &psid) != 0) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the printer")); -+ freecon(devcon); -+ return (NULL); -+ } -+ freecon(devcon); -+ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) -+ { -+ /* -+ * The access check failed, so cancel the job and send an audit message -+ */ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=? auid=%u acct=%s obj=%s refused" -+ " unable to access printer=%s", con->auid, -+ con->username, con->scon, printer->name); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 0); -+ cupsdClearString(&audit_message); -+ } -+ -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer")); -+ return (NULL); -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - if ((job = cupsdAddJob(priority, printer->name)) == NULL) - { - send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1550,6 +1680,32 @@ add_job(cupsd_client_t *con, /* I - Cl - return (NULL); - } - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ /* -+ * duplicate the security context and auid of the connection into the job structure -+ */ -+ job->scon = strdup(con->scon); -+ job->auid = con->auid; -+ -+ /* -+ * add the security context to the request so that on a restart the security -+ * attributes will be able to be restored -+ */ -+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "security-context", -+ NULL, job->scon); -+ } -+ else -+ { -+ /* -+ * Fill in the security context of the job as unlabeled -+ */ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: setting context of job to %s", UNKNOWN_SL); -+ cupsdSetString(&job->scon, UNKNOWN_SL); -+ } -+#endif /* WITH_LSPP */ -+ - job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE); - job->attrs = con->request; - job->dirty = 1; -@@ -1759,6 +1915,29 @@ add_job(cupsd_client_t *con, /* I - Cl - attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]); - attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]); - } -+#ifdef WITH_LSPP -+ else -+ { -+ /* -+ * The option was present, so capture the user supplied strings -+ */ -+ userheader = strdup(attr->values[0].string.text); -+ -+ if (attr->num_values > 1) -+ userfooter = strdup(attr->values[1].string.text); -+ -+ if (Classification != NULL && (strcmp(userheader, Classification) == 0) -+ && userfooter &&(strcmp(userfooter, Classification) == 0)) -+ { -+ /* -+ * Since both values are Classification, the user is not trying to Override -+ */ -+ free(userheader); -+ if (userfooter) free(userfooter); -+ userheader = userfooter = NULL; -+ } -+ } -+#endif /* WITH_LSPP */ - - job->job_sheets = attr; - -@@ -1789,6 +1968,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-sheets=\"%s,none\", " - "job-originating-user-name=\"%s\"", - Classification, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - else if (attr->num_values == 2 && - strcmp(attr->values[0].string.text, -@@ -1807,6 +1989,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-originating-user-name=\"%s\"", - attr->values[0].string.text, - attr->values[1].string.text, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - else if (strcmp(attr->values[0].string.text, Classification) && - strcmp(attr->values[0].string.text, "none") && -@@ -1827,6 +2012,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-originating-user-name=\"%s\"", - attr->values[0].string.text, - attr->values[1].string.text, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - } - else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1867,8 +2055,52 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-sheets=\"%s\", " - "job-originating-user-name=\"%s\"", - Classification, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ -+ } -+#ifdef WITH_LSPP -+ if (is_lspp_config() && AuditLog != -1) -+ { -+ audit_message = NULL; -+ -+ if (userheader || userfooter) -+ { -+ if (!override) -+ { -+ /* -+ * The user overrode the banner, so audit it -+ */ -+ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" -+ " using banners=%s,%s", job->id, userheader, -+ userfooter, attr->values[0].string.text, -+ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, -+ ServerName, NULL, NULL, 1); -+ } -+ else -+ { -+ /* -+ * The user tried to override the banner, audit the failure -+ */ -+ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" -+ " ignored banners=%s,%s", job->id, userheader, -+ userfooter, attr->values[0].string.text, -+ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, -+ ServerName, NULL, NULL, 0); -+ } -+ cupsdClearString(&audit_message); -+ } - } -+ -+ if (userheader) -+ free(userheader); -+ if (userfooter) -+ free(userfooter); -+#endif /* WITH_LSPP */ - } -+ - - /* - * See if we need to add the starting sheet... -@@ -3615,6 +3847,111 @@ check_rss_recipient( - } - - -+#ifdef WITH_LSPP -+/* -+ * 'check_context()' - Check SELinux security context of a user and job -+ */ -+ -+static int /* O - 1 if OK, 0 if not, -1 on error */ -+check_context(cupsd_client_t *con, /* I - Client connection */ -+ cupsd_job_t *job) /* I - Job */ -+{ -+ int enforcing; /* is SELinux in enforcing mode */ -+ char filename[1024]; /* Filename of the spool file */ -+ security_id_t clisid; /* SELinux SID of the client */ -+ security_id_t jobsid; /* SELinux SID of the job */ -+ security_id_t filesid; /* SELinux SID of the spool file */ -+ struct avc_entry_ref avcref; /* AVC entry cache pointer */ -+ security_class_t tclass; /* SELinux security class */ -+ access_vector_t avr; /* SELinux access being queried */ -+ security_context_t spoolfilecon; /* SELinux context of the spool file */ -+ -+ -+ /* -+ * Validate the input to be sure there are contexts to work with... -+ */ -+ -+ if (con->scon == NULL || job->scon == NULL -+ || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0 -+ || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ return -1; -+ -+ if ((enforcing = security_getenforce()) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Error while determining SELinux enforcement"); -+ return -1; -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "check_context: client context %s job context %s", con->scon, job->scon); -+ -+ -+ /* -+ * Initialize the avc engine... -+ */ -+ -+ static avc_initialized = 0; -+ if (! avc_initialized++) -+ { -+ if (avc_init("cupsd", NULL, NULL, NULL, NULL) < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable avc_init"); -+ return -1; -+ } -+ } -+ if (avc_context_to_sid(con->scon, &clisid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable to convert %s to SELinux sid", con->scon); -+ return -1; -+ } -+ if (avc_context_to_sid(job->scon, &jobsid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable to convert %s to SELinux sid", job->scon); -+ return -1; -+ } -+ avc_entry_ref_init(&avcref); -+ tclass = SECCLASS_FILE; -+ avr = FILE__READ; -+ -+ /* -+ * Perform the check with the client as the subject, first with the job as the object -+ * if that fails then with the spool file as the object... -+ */ -+ -+ if (avc_has_perm_noaudit(clisid, jobsid, tclass, avr, &avcref, NULL) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access based on the client context"); -+ -+ snprintf(filename, sizeof(filename), "%s/c%05d", RequestRoot, job->id); -+ if (getfilecon(filename, &spoolfilecon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to get spoolfile context"); -+ return -1; -+ } -+ if (avc_context_to_sid(spoolfilecon, &filesid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to determine the SELinux sid for the spool file"); -+ freecon(spoolfilecon); -+ return -1; -+ } -+ freecon(spoolfilecon); -+ if (avc_has_perm_noaudit(clisid, filesid, tclass, avr, &avcref, NULL) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access to the spool file"); -+ return 0; -+ } -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access to the spool file"); -+ return 1; -+ } -+ else -+ if (enforcing == 0) -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: allowing operation due to permissive mode"); -+ else -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access based on the client context"); -+ -+ return 1; -+} -+#endif /* WITH_LSPP */ -+ -+ - /* - * 'check_quotas()' - Check quotas for a printer and user. - */ -@@ -4067,6 +4404,15 @@ copy_banner(cupsd_client_t *con, /* I - - char attrname[255], /* Name of attribute */ - *s; /* Pointer into name */ - ipp_attribute_t *attr; /* Attribute */ -+#ifdef WITH_LSPP -+ const char *mls_label; /* SL of print job */ -+ char *jobrange; /* SELinux sensitivity range */ -+ char *jobclearance; /* SELinux low end clearance */ -+ context_t jobcon; /* SELinux context of the job */ -+ context_t tmpcon; /* Temp context to set the level */ -+ security_context_t spoolcon; /* Context of the file in the spool */ -+#endif /* WITH_LSPP */ -+ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -4102,6 +4448,82 @@ copy_banner(cupsd_client_t *con, /* I - - - fchmod(cupsFileNumber(out), 0640); - fchown(cupsFileNumber(out), RunUser, Group); -+#ifdef WITH_LSPP -+ if (job->scon != NULL && -+ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(filename, &spoolcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to get the context of the banner file %s - %s", -+ filename, strerror(errno)); -+ job->num_files --; -+ return (0); -+ } -+ tmpcon = context_new(spoolcon); -+ jobcon = context_new(job->scon); -+ freecon(spoolcon); -+ if (!tmpcon || !jobcon) -+ { -+ if (tmpcon) -+ context_free(tmpcon); -+ if (jobcon) -+ context_free(jobcon); -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to get the SELinux contexts"); -+ job->num_files --; -+ return (0); -+ } -+ jobrange = context_range_get(jobcon); -+ if (jobrange) -+ { -+ jobrange = strdup(jobrange); -+ if ((jobclearance = strtok(jobrange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, jobclearance) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the level of the context for file %s - %s", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the level of the context for file %s - %s", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ } -+ free(jobrange); -+ } -+ if (setfilecon(filename, context_str(tmpcon)) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the context of the banner file %s - %s", -+ filename, strerror(errno)); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner: %s set to %s", -+ filename, context_str(tmpcon)); -+ context_free(jobcon); -+ context_free(tmpcon); -+ } -+#endif /* WITH_LSPP */ - - /* - * Try the localized banner file under the subdirectory... -@@ -4196,6 +4618,24 @@ copy_banner(cupsd_client_t *con, /* I - - else - s = attrname; - -+#ifdef WITH_LSPP -+ if (strcmp(s, "mls-label") == 0) -+ { -+ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ jobcon = context_new(job->scon); -+ if (_cups_strcasecmp(name, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (_cups_strcasecmp(name, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else // default to using the whole context string -+ mls_label = context_str(jobcon); -+ cupsFilePuts(out, mls_label); -+ context_free(jobcon); -+ } -+ continue; -+ } -+#endif /* WITH_LSPP */ - if (!strcmp(s, "printer-name")) - { - cupsFilePuts(out, job->dest); -@@ -6273,6 +6713,22 @@ get_job_attrs(cupsd_client_t *con, /* I - - exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username); - -+ -+#ifdef WITH_LSPP -+ /* -+ * Check SELinux... -+ */ -+ if (is_lspp_config() && check_context(con, job) != 1) -+ { -+ /* -+ * Unfortunately we have to lie to the user... -+ */ -+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); -+ return; -+ } -+#endif /* WITH_LSPP */ -+ -+ - /* - * Copy attributes... - */ -@@ -6626,6 +7082,11 @@ get_jobs(cupsd_client_t *con, /* I - C - if (username[0] && _cups_strcasecmp(username, job->username)) - continue; - -+#ifdef WITH_LSPP -+ if (is_lspp_config() && check_context(con, job) != 1) -+ continue; -+#endif /* WITH_LSPP */ -+ - if (count > 0) - ippAddSeparator(con->response); - -@@ -11106,6 +11567,11 @@ validate_user(cupsd_job_t *job, /* I - - strlcpy(username, get_username(con), userlen); - -+#ifdef WITH_LSPP -+ if (is_lspp_config() && check_context(con, job) != 1) -+ return 0; -+#endif /* WITH_LSPP */ -+ - /* - * Check the username against the owner... - */ -diff -up cups-1.6b1/scheduler/job.c.lspp cups-1.6b1/scheduler/job.c ---- cups-1.6b1/scheduler/job.c.lspp 2012-05-25 17:01:32.824768691 +0200 -+++ cups-1.6b1/scheduler/job.c 2012-05-25 17:22:50.856860012 +0200 -@@ -68,6 +68,9 @@ - * update_job_attrs() - Update the job-printer-* attributes. - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -83,6 +86,14 @@ - # endif /* HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H */ - #endif /* __APPLE__ */ - -+#ifdef WITH_LSPP -+#include <libaudit.h> -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <selinux/avc.h> -+#include <selinux/flask.h> -+#include <selinux/av_permissions.h> -+#endif /* WITH_LSPP */ - - /* - * Design Notes for Job Management -@@ -580,6 +591,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I - /* PRINTER_STATE_REASONS env var */ - rip_max_cache[255]; - /* RIP_MAX_CACHE env variable */ -+#ifdef WITH_LSPP -+ char *audit_message = NULL; /* Audit message string */ -+ context_t jobcon; /* SELinux context of the job */ -+ char *label_template = NULL; /* SL to put in classification -+ env var */ -+ const char *mls_label = NULL; /* SL to put in classification -+ env var */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -1071,6 +1090,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I - } - } - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", -+ job->id, job->auid, job->username, job->printer->name, title); -+ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ } -+ else -+ { -+ jobcon = context_new(job->scon); -+ -+ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) -+ label_template = strdup(Classification); -+ else if (attr->num_values > 1 && -+ strcmp(attr->values[1].string.text, "none") != 0) -+ label_template = strdup(attr->values[1].string.text); -+ else -+ label_template = strdup(attr->values[0].string.text); -+ -+ if (_cups_strcasecmp(label_template, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (_cups_strcasecmp(label_template, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else if (_cups_strcasecmp(label_template, SELINUX_CONFIG) == 0) -+ mls_label = context_str(jobcon); -+ else -+ mls_label = label_template; -+ -+ if (mls_label && (PerPageLabels || banner_page)) -+ { -+ snprintf(classification, sizeof(classification), "CLASSIFICATION=LSPP:%s", mls_label); -+ envp[envc ++] = classification; -+ } -+ -+ if ((AuditLog != -1) && !banner_page) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" -+ " obj=%s label=%s", job->id, job->auid, job->username, -+ job->printer->name, title, job->scon, mls_label?mls_label:"none"); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ context_free(jobcon); -+ free(label_template); -+ } -+ } -+ else -+ /* -+ * Fall through to the non-LSPP behavior -+ */ -+#endif /* WITH_LSPP */ - if (Classification && !banner_page) - { - if ((attr = ippFindAttribute(job->attrs, "job-sheets", -@@ -1845,6 +1925,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J - ippSetString(job->attrs, &job->reasons, 0, "none"); - } - -+#ifdef WITH_LSPP -+ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) -+ cupsdSetString(&job->scon, attr->values[0].string.text); -+ else if (is_lspp_config()) -+ { -+ /* -+ * There was no security context so delete the job -+ */ -+ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", -+ jobfile); -+ goto error; -+ } -+#endif /* WITH_LSPP */ -+ - job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", - IPP_TAG_INTEGER); - job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -2235,6 +2329,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J - { - char filename[1024]; /* Job control filename */ - cups_file_t *fp; /* Job file */ -+#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job control file */ -+ context_t jobcon; /* contex_t container for job->scon */ -+ context_t tmpcon; /* Temp context to swap the level */ -+ char *jobclearance; /* SELinux low end clearance */ -+ const char *jobrange; /* SELinux sensitivity range */ -+ char *jobrange_copy; /* SELinux sensitivity range */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -2247,6 +2349,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J - - fchown(cupsFileNumber(fp), RunUser, Group); - -+#ifdef WITH_LSPP -+ if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(filename, &spoolcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to get context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ return; -+ } -+ jobcon = context_new(job->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!jobcon || !tmpcon) -+ { -+ if (jobcon) -+ context_free(jobcon); -+ if (tmpcon) -+ context_free(tmpcon); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get SELinux contexts"); -+ return; -+ } -+ jobrange = context_range_get(jobcon); -+ if (jobrange) -+ { -+ jobrange_copy = strdup(jobrange); -+ if ((jobclearance = strtok(jobrange_copy, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, jobclearance) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange_copy); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange_copy); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ free(jobrange_copy); -+ } -+ if (setfilecon(filename, context_str(tmpcon)) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p): new spool file context=%s", -+ job, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ } -+#endif /* WITH_LSPP */ -+ - job->attrs->state = IPP_IDLE; - - if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -3735,6 +3907,18 @@ get_options(cupsd_job_t *job, /* I - Jo - banner_page) - continue; - -+#ifdef WITH_LSPP -+ /* -+ * In LSPP mode refuse to honor the page-label -+ */ -+ if (is_lspp_config() && -+ !strcmp(attr->name, "page-label")) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Ignoring page-label option due to LSPP mode"); -+ continue; -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Otherwise add them to the list... - */ -@@ -4457,6 +4641,19 @@ static void - start_job(cupsd_job_t *job, /* I - Job ID */ - cupsd_printer_t *printer) /* I - Printer to print job */ - { -+#ifdef WITH_LSPP -+ char *audit_message = NULL; /* Audit message string */ -+ char *printerfile = NULL; /* Device file pointed to by the printer */ -+ security_id_t clisid; /* SELinux SID for the client */ -+ security_id_t psid; /* SELinux SID for the printer */ -+ context_t printercon; /* Printer's context string */ -+ struct stat printerstat; /* Printer's stat buffer */ -+ security_context_t devcon; /* Printer's SELinux context */ -+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ -+ security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ -+#endif /* WITH_LSPP */ -+ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", - job, job->id, printer, printer->name); - -@@ -4599,6 +4796,108 @@ start_job(cupsd_job_t *job, /* I - - fcntl(job->side_pipes[1], F_SETFD, - fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ /* -+ * Perform an access check before printing, but only if the printer starts with /dev/ -+ */ -+ printerfile = strstr(printer->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) -+ printerfile = printer->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "StartJob: Attempting to check access on printer device %s", printerfile); -+ if (lstat(printerfile, &printerstat) < 0) -+ { -+ if (errno != ENOENT) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to stat the printer"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ /* -+ * The printer does not exist, so for now assume it's a FileDevice -+ */ -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else if (S_ISCHR(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_CHR_FILE; -+ avr = CHR_FILE__WRITE; -+ } -+ else if (S_ISREG(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Printer is not a character device or regular file"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ static avc_initialized = 0; -+ if (!avc_initialized++) -+ avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); -+ avc_entry_ref_init(&avcref); -+ if (avc_context_to_sid(job->scon, &clisid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the job"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", -+ printerfile); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ printercon = context_new(devcon); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: printer context %s client context %s", -+ context_str(printercon), job->scon); -+ context_free(printercon); -+ -+ if (avc_context_to_sid(devcon, &psid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the printer"); -+ freecon(devcon); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ freecon(devcon); -+ -+ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) -+ { -+ /* -+ * The access check failed, so cancel the job and send an audit message -+ */ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s canceled" -+ " unable to access printer=%s", job->id, -+ job->auid, (job->username)?job->username:"?", job->scon, printer->name); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 0); -+ cupsdClearString(&audit_message); -+ } -+ -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ -+ return ; -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Now start the first file in the job... - */ -diff -up cups-1.6b1/scheduler/job.h.lspp cups-1.6b1/scheduler/job.h ---- cups-1.6b1/scheduler/job.h.lspp 2012-05-23 03:36:50.000000000 +0200 -+++ cups-1.6b1/scheduler/job.h 2012-05-25 17:23:41.802504888 +0200 -@@ -13,6 +13,13 @@ - * file is missing or damaged, see the license at "http://www.cups.org/". - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#endif /* WITH_LSPP */ -+ - /* - * Constants... - */ -@@ -82,6 +89,10 @@ struct cupsd_job_s /**** Job request * - int progress; /* Printing progress */ - int num_keywords; /* Number of PPD keywords */ - cups_option_t *keywords; /* PPD keywords */ -+#ifdef WITH_LSPP -+ security_context_t scon; /* Security context of job */ -+ uid_t auid; /* Audit loginuid for this job */ -+#endif /* WITH_LSPP */ - }; - - typedef struct cupsd_joblog_s /**** Job log message ****/ -diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/scheduler/main.c ---- cups-1.6b1/scheduler/main.c.lspp 2012-05-25 17:01:32.849768516 +0200 -+++ cups-1.6b1/scheduler/main.c 2012-05-25 17:01:32.868768383 +0200 -@@ -38,6 +38,8 @@ - * usage() - Show scheduler usage. - */ - -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -75,6 +77,9 @@ - # include <notify.h> - #endif /* HAVE_NOTIFY_H */ - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+#endif /* WITH_LSPP */ - - /* - * Local functions... -@@ -138,6 +143,9 @@ main(int argc, /* I - Number of comm - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -+#if WITH_LSPP -+ auditfail_t failmode; /* Action for audit_open failure */ -+#endif /* WITH_LSPP */ - #ifdef __sgi - cups_file_t *fp; /* Fake lpsched lock file */ - struct stat statbuf; /* Needed for checking lpsched FIFO */ -@@ -463,6 +471,25 @@ main(int argc, /* I - Number of comm - #endif /* DEBUG */ - } - -+#ifdef WITH_LSPP -+ if ((AuditLog = audit_open()) < 0 ) -+ { -+ if (get_auditfail_action(&failmode) == 0) -+ { -+ if (failmode == FAIL_LOG) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); -+ AuditLog = -1; -+ } -+ else if (failmode == FAIL_TERMINATE) -+ { -+ fprintf(stderr, "cupsd: unable to start auditing, terminating"); -+ return -1; -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Set the timezone info... - */ -@@ -1180,6 +1207,11 @@ main(int argc, /* I - Number of comm - - cupsdStopSelect(); - -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ audit_close(AuditLog); -+#endif /* WITH_LSPP */ -+ - return (!stop_scheduler); - } - -diff -up cups-1.6b1/scheduler/printers.c.lspp cups-1.6b1/scheduler/printers.c ---- cups-1.6b1/scheduler/printers.c.lspp 2012-05-25 17:01:32.786768955 +0200 -+++ cups-1.6b1/scheduler/printers.c 2012-05-25 17:24:11.144300359 +0200 -@@ -56,6 +56,8 @@ - * write_xml_string() - Write a string with XML escaping. - */ - -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -80,6 +82,10 @@ - # include <asl.h> - #endif /* __APPLE__ */ - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+# include <selinux/context.h> -+#endif /* WITH_LSPP */ - - /* - * Local functions... -@@ -2101,6 +2107,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) - "username", - "password" - }; -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+ char *printerfile; /* Path to a local printer dev */ -+ char *rangestr; /* Printer's range if its available */ -+ security_context_t devcon; /* Printer SELinux context */ -+ context_t printercon; /* context_t for the printer */ -+#endif /* WITH_LSPP */ - - - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2234,6 +2247,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) - attr->values[1].string.text = _cupsStrAlloc(Classification ? - Classification : p->job_sheets[1]); - } -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ rangestr = NULL; -+ printercon = 0; -+ printerfile = strstr(p->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) -+ printerfile = p->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ if(is_selinux_enabled()) -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSetPrinterAttrs: Unable to get printer context"); -+ } -+ else -+ { -+ printercon = context_new(devcon); -+ freecon(devcon); -+ } -+ } -+ -+ if (printercon && context_range_get(printercon)) -+ rangestr = strdup(context_range_get(printercon)); -+ else -+ rangestr = strdup("unknown"); -+ -+ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", -+ p->name, p->sanitized_device_uri, p->job_sheets[0], p->job_sheets[1], rangestr); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ if (printercon) -+ context_free(printercon); -+ free(rangestr); -+ cupsdClearString(&audit_message); -+ } -+#endif /* WITH_LSPP */ - } - - p->raw = 0; -@@ -5320,7 +5372,6 @@ write_irix_state(cupsd_printer_t *p) /* - } - #endif /* __sgi */ - -- - /* - * 'write_xml_string()' - Write a string with XML escaping. - */ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 69f8d8ee6cc005c7ca9e0f5bdb0ea017f7a7c0c7
by git＠ipfire.org 09 Sep '16

09 Sep '16

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 69f8d8ee6cc005c7ca9e0f5bdb0ea017f7a7c0c7 (commit) from 5fba8a0b1ebcb29340e225707193c0147c4cb64a (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 69f8d8ee6cc005c7ca9e0f5bdb0ea017f7a7c0c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 9 14:57:07 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/unbound | 3 --- 1 file changed, 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 94eeba7..aee5808 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -5,7 +5,6 @@ etc/unbound/forward.conf etc/unbound/icannbundle.pem etc/unbound/local.d etc/unbound/root.hints -etc/unbound/root.key etc/unbound/unbound.conf #usr/include/unbound.h #usr/lib/libunbound.la @@ -18,8 +17,6 @@ usr/sbin/unbound-checkconf usr/sbin/unbound-dhcp-leases-bridge usr/sbin/unbound-control usr/sbin/unbound-control-setup -usr/sbin/unbound-switch -usr/sbin/unbound-zone #usr/share/man/man1/unbound-host.1 #usr/share/man/man3/libunbound.3 #usr/share/man/man3/ub_cancel.3 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 58e0cdc69440670791bf7fec4fe9eaf17d80e390
by git＠ipfire.org 08 Sep '16

08 Sep '16

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 3.x development tree". The branch, master has been updated via 58e0cdc69440670791bf7fec4fe9eaf17d80e390 (commit) via 7116f2dd26478227b89437de5c24b2107665d102 (commit) via f7d4e86eba987ece2bcbc0d0524446431a65197c (commit) from 5589c80fef41be6e151866cd319f020856938b58 (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 58e0cdc69440670791bf7fec4fe9eaf17d80e390 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 22:33:18 2016 +0100 libtevent: Update to version 0.9.30 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7116f2dd26478227b89437de5c24b2107665d102 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 22:33:03 2016 +0100 libtalloc: Update to version 2.1.8 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f7d4e86eba987ece2bcbc0d0524446431a65197c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 22:32:51 2016 +0100 libldb: Update to version 1.1.27 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libldb/libldb.nm | 2 +- libtalloc/libtalloc.nm | 2 +- libtevent/libtevent.nm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/libldb/libldb.nm b/libldb/libldb.nm index 25be163..0664270 100644 --- a/libldb/libldb.nm +++ b/libldb/libldb.nm @@ -4,7 +4,7 @@ ############################################################################### name = libldb -version = 1.1.26 +version = 1.1.27 release = 1 groups = System/Libraries diff --git a/libtalloc/libtalloc.nm b/libtalloc/libtalloc.nm index dead9ff..0fb84d3 100644 --- a/libtalloc/libtalloc.nm +++ b/libtalloc/libtalloc.nm @@ -4,7 +4,7 @@ ############################################################################### name = libtalloc -version = 2.1.6 +version = 2.1.8 release = 1 groups = System/Libraries diff --git a/libtevent/libtevent.nm b/libtevent/libtevent.nm index 8834c23..4547a9e 100644 --- a/libtevent/libtevent.nm +++ b/libtevent/libtevent.nm @@ -4,8 +4,8 @@ ############################################################################### name = libtevent -version = 0.9.28 -release = 2 +version = 0.9.30 +release = 1 groups = System/Libraries url = http://tevent.samba.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5fba8a0b1ebcb29340e225707193c0147c4cb64a
by git＠ipfire.org 08 Sep '16

08 Sep '16

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 5fba8a0b1ebcb29340e225707193c0147c4cb64a (commit) via b658a451fbb2f551f4e2765ab14eac34e0eca7b1 (commit) via b4255d757f98cc5bd6cf60ac245c60b78871849f (commit) via 47c3e83253693f80a5ef38af6e9cdd276bf9a5da (commit) via 6302a24890f8530924e4468daca575e7336f4a87 (commit) via 1b4f2493a5beeb38336c6d98a4dd3bc6a24b1aa4 (commit) via df7340d2f3232a87ae6e3e11a6cb4e15b74e55a3 (commit) via 9625be6f24f73a40f987b9a79657f026405f9c29 (commit) via 61b4250af56cdd8cb97187098ed5b4b6b93acb85 (commit) via b8f5eda86b6d1c7270e858214a96e5eded18876a (commit) via 0fbd7c3c81ca0740cf8e6f4c47253ff4dd48e7df (commit) via cb21683968ddc0d5eab4c131c69aa665ff5d7dc8 (commit) via c648dd88f57309f08d2703bdb4596aaa75d776aa (commit) via 76f5c54236fdb2714fbb6d890a7b079d5aa4f9fc (commit) via 89b0810b240967e4ae4101ad2736b74792a3c80a (commit) via 08f6cdcf828aa6e03e59b9054b68eede80a13ebe (commit) via d0e5f71f77e5bcbeef1edbded3ca0a0bd564a34f (commit) from 3364c93e37c65ed8544066ed55afe1941b2b6f8d (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 5fba8a0b1ebcb29340e225707193c0147c4cb64a Merge: 3364c93 b658a45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 19:50:45 2016 +0100 Merge branch 'unbound' into next commit b658a451fbb2f551f4e2765ab14eac34e0eca7b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 19:46:43 2016 +0100 unbound: Automatically scale configuration to system Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b4255d757f98cc5bd6cf60ac245c60b78871849f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 15:02:08 2016 +0100 Rootfile update Forgot to commit this one Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 47c3e83253693f80a5ef38af6e9cdd276bf9a5da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 12:45:11 2016 +0100 unbound is not supposed to be a package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6302a24890f8530924e4468daca575e7336f4a87 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 20:58:50 2016 +0100 make.sh: Unbound depends on libevent Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1b4f2493a5beeb38336c6d98a4dd3bc6a24b1aa4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:41:27 2016 +0100 unbound: Update dynamically configured DNS servers after connecting RED Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df7340d2f3232a87ae6e3e11a6cb4e15b74e55a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:32:34 2016 +0100 Add unboundctrl Control binary to relaunch unbound from the web user interface Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9625be6f24f73a40f987b9a79657f026405f9c29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:30:14 2016 +0100 webinterface: Replace dnsmasq with unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 61b4250af56cdd8cb97187098ed5b4b6b93acb85 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:25:48 2016 +0100 Drop dnsmasq This will be replaced by unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8f5eda86b6d1c7270e858214a96e5eded18876a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:20:27 2016 +0100 unbound: Rewrite configuration and initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0fbd7c3c81ca0740cf8e6f4c47253ff4dd48e7df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 16:48:39 2016 +0100 Import Unbound DHCP Lease Bridge Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb21683968ddc0d5eab4c131c69aa665ff5d7dc8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:24:00 2016 +0100 unbound: Ship ICANN's certificates for trust anchor validation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c648dd88f57309f08d2703bdb4596aaa75d776aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:20:07 2016 +0100 unbound: Update trust anchor once a day Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 76f5c54236fdb2714fbb6d890a7b079d5aa4f9fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:12:01 2016 +0100 unbound: Install trust anchor in /var/lib/unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89b0810b240967e4ae4101ad2736b74792a3c80a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 14:43:47 2016 +0100 python-daemon: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 08f6cdcf828aa6e03e59b9054b68eede80a13ebe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 5 13:33:47 2016 +0100 New package: python inotify Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0e5f71f77e5bcbeef1edbded3ca0a0bd564a34f Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Tue Aug 2 20:48:17 2016 +0200 New package: unbound 1.5.9 Unbound is a validating, recursive, and caching DNS resolver. https://www.unbound.net Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 3 + config/etc/group | 1 - config/etc/passwd | 1 - config/rootfiles/common/armv5tel/initscripts | 5 +- config/rootfiles/common/dnsmasq | 2 - config/rootfiles/common/i586/initscripts | 5 +- config/rootfiles/common/misc-progs | 2 +- config/rootfiles/common/python-daemon | 19 ++ config/rootfiles/common/python-docutils | 320 ++++++++++++++++++ config/rootfiles/common/python-inotify | 20 ++ config/rootfiles/common/unbound | 62 ++++ config/rootfiles/common/x86_64/initscripts | 5 +- config/unbound/icannbundle.pem | 317 ++++++++++++++++++ config/unbound/root.hints | 90 +++++ config/unbound/root.key | 1 + config/unbound/unbound-dhcp-leases-bridge | 354 ++++++++++++++++++++ config/unbound/unbound.conf | 94 ++++++ html/cgi-bin/dnsforward.cgi | 12 +- html/cgi-bin/logs.cgi/log.dat | 2 +- html/cgi-bin/services.cgi | 2 +- lfs/dnsmasq | 104 ------ lfs/initscripts | 2 - lfs/{python-xattr => python-daemon} | 15 +- lfs/{python-xattr => python-docutils} | 15 +- lfs/{python-xattr => python-inotify} | 15 +- lfs/{bird => unbound} | 46 ++- make.sh | 9 +- src/initscripts/init.d/dnsmasq | 145 -------- src/initscripts/init.d/network | 9 - .../networking/red.down/05-update-dns-forwarders | 4 + .../networking/red.up/05-update-dns-forwarders | 4 + src/initscripts/init.d/unbound | 226 +++++++++++++ src/misc-progs/Makefile | 2 +- src/misc-progs/{dnsmasqctrl.c => unboundctrl.c} | 6 +- ...q-Add-support-to-read-ISC-DHCP-lease-file.patch | 363 --------------------- ...late_length_of_TFTP_error_reply_correctly.patch | 65 ---- .../dnsmasq/002-Zero_newly_malloc_ed_memory.patch | 36 -- .../003-Check_return_of_expand_always.patch | 44 --- .../004-Fix_editing_error_on_man_page.patch | 40 --- src/patches/dnsmasq/005-Manpage_typo.patch | 25 -- ...aviour_with_some_DHCP_option_arrangements.patch | 49 --- ...007-Fix_logic_error_in_Linux_netlink_code.patch | 55 ---- .../008-Fix_problem_with_--dnssec-timestamp.patch | 93 ------ .../009-malloc_memset_calloc_for_efficiency.patch | 46 --- ...put_to_reduce_risk_of_information_leakage.patch | 169 ---------- ...on_transmission_in_case_of_retransmission.patch | 54 --- ...n_buffer_sizes_for_leasefile_parsing_code.patch | 103 ------ ...allow_to_exclude_ip_addresses_from_answer.patch | 184 ----------- ...rial_when_reloading_etc_hosts_and_friends.patch | 41 --- ..._IPv6_addresses_sanely_for_--synth-domain.patch | 101 ------ ...ode_to_remove_blatant_copyright_violation.patch | 149 --------- 51 files changed, 1584 insertions(+), 1952 deletions(-) delete mode 100644 config/rootfiles/common/dnsmasq create mode 100644 config/rootfiles/common/python-daemon create mode 100644 config/rootfiles/common/python-docutils create mode 100644 config/rootfiles/common/python-inotify create mode 100644 config/rootfiles/common/unbound create mode 100644 config/unbound/icannbundle.pem create mode 100644 config/unbound/root.hints create mode 100644 config/unbound/root.key create mode 100644 config/unbound/unbound-dhcp-leases-bridge create mode 100644 config/unbound/unbound.conf delete mode 100644 lfs/dnsmasq copy lfs/{python-xattr => python-daemon} (93%) copy lfs/{python-xattr => python-docutils} (93%) copy lfs/{python-xattr => python-inotify} (93%) copy lfs/{bird => unbound} (73%) delete mode 100644 src/initscripts/init.d/dnsmasq create mode 100644 src/initscripts/init.d/networking/red.down/05-update-dns-forwarders create mode 100644 src/initscripts/init.d/networking/red.up/05-update-dns-forwarders create mode 100644 src/initscripts/init.d/unbound rename src/misc-progs/{dnsmasqctrl.c => unboundctrl.c} (74%) delete mode 100644 src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch delete mode 100644 src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch delete mode 100644 src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch delete mode 100644 src/patches/dnsmasq/003-Check_return_of_expand_always.patch delete mode 100644 src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch delete mode 100644 src/patches/dnsmasq/005-Manpage_typo.patch delete mode 100644 src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch delete mode 100644 src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch delete mode 100644 src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch delete mode 100644 src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch delete mode 100644 src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch delete mode 100644 src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch delete mode 100644 src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch delete mode 100644 src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch delete mode 100644 src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch delete mode 100644 src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch delete mode 100644 src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index c42c650..c6d8a72 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -67,3 +67,6 @@ HOME=/ # Cleanup the mail spool directory %weekly * * /usr/sbin/dma-cleanup-spool + +# Update DNS trust anchor +%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem diff --git a/config/etc/group b/config/etc/group index 51334aa..e4897db 100644 --- a/config/etc/group +++ b/config/etc/group @@ -30,7 +30,6 @@ nobody:x:99: users:x:100: snort:x:101: logwatch:x:102: -dnsmasq:x:103: cron:x:104: syslogd:x:105: klogd:x:106: diff --git a/config/etc/passwd b/config/etc/passwd index 0c2527c..542e3bf 100644 --- a/config/etc/passwd +++ b/config/etc/passwd @@ -14,7 +14,6 @@ nobody:x:99:99:Nobody:/home/nobody:/bin/false postfix:x:100:100::/var/spool/postfix:/bin/false snort:x:101:101:ftp:/var/log/snort:/bin/false logwatch:x:102:102::/var/log/logwatch:/bin/false -dnsmasq:x:103:103::/:/bin/false cron:x:104:104::/:/bin/false syslogd:x:105:105:/var/empty:/bin/false klogd:x:106:106:/var/empty:/bin/false diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 29b3290..a429d2c 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -26,7 +26,6 @@ etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay #etc/rc.d/init.d/dnsdist -etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail etc/rc.d/init.d/fireinfo @@ -76,7 +75,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn @@ -84,7 +83,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/rootfiles/common/dnsmasq b/config/rootfiles/common/dnsmasq deleted file mode 100644 index 1e90012..0000000 --- a/config/rootfiles/common/dnsmasq +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/dnsmasq -#usr/share/man/man8/dnsmasq.8 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index ee5a4ab..2053bd9 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -27,7 +27,6 @@ etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay #etc/rc.d/init.d/dnsdist -etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail etc/rc.d/init.d/fireinfo @@ -78,7 +77,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn @@ -86,7 +85,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 1917884..63a0051 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -5,7 +5,6 @@ usr/local/bin/backupctrl usr/local/bin/collectdctrl usr/local/bin/ddnsctrl usr/local/bin/dhcpctrl -usr/local/bin/dnsmasqctrl usr/local/bin/extrahdctrl usr/local/bin/fireinfoctrl usr/local/bin/getconntracktable @@ -33,6 +32,7 @@ usr/local/bin/sshctrl usr/local/bin/syslogdctrl usr/local/bin/timectrl #usr/local/bin/torctrl +usr/local/bin/unboundctrl usr/local/bin/updxlratorctrl usr/local/bin/upnpctrl usr/local/bin/urlfilterctrl diff --git a/config/rootfiles/common/python-daemon b/config/rootfiles/common/python-daemon new file mode 100644 index 0000000..34d36a4 --- /dev/null +++ b/config/rootfiles/common/python-daemon @@ -0,0 +1,19 @@ +#usr/lib/python2.7/site-packages/daemon +usr/lib/python2.7/site-packages/daemon/__init__.py +usr/lib/python2.7/site-packages/daemon/__init__.pyc +usr/lib/python2.7/site-packages/daemon/_metadata.py +usr/lib/python2.7/site-packages/daemon/_metadata.pyc +usr/lib/python2.7/site-packages/daemon/daemon.py +usr/lib/python2.7/site-packages/daemon/daemon.pyc +usr/lib/python2.7/site-packages/daemon/pidfile.py +usr/lib/python2.7/site-packages/daemon/pidfile.pyc +usr/lib/python2.7/site-packages/daemon/runner.py +usr/lib/python2.7/site-packages/daemon/runner.pyc +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/PKG-INFO +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/SOURCES.txt +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/dependency_links.txt +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/not-zip-safe +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/requires.txt +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/top_level.txt +#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/version_info.json diff --git a/config/rootfiles/common/python-docutils b/config/rootfiles/common/python-docutils new file mode 100644 index 0000000..45038dd --- /dev/null +++ b/config/rootfiles/common/python-docutils @@ -0,0 +1,320 @@ +#usr/bin/rst2html.py +#usr/bin/rst2latex.py +#usr/bin/rst2man.py +#usr/bin/rst2odt.py +#usr/bin/rst2odt_prepstyles.py +#usr/bin/rst2pseudoxml.py +#usr/bin/rst2s5.py +#usr/bin/rst2xetex.py +#usr/bin/rst2xml.py +#usr/bin/rstpep2html.py +#usr/lib/python2.7/site-packages/docutils +#usr/lib/python2.7/site-packages/docutils-0.12-py2.7.egg-info +#usr/lib/python2.7/site-packages/docutils/__init__.py +#usr/lib/python2.7/site-packages/docutils/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/_compat.py +#usr/lib/python2.7/site-packages/docutils/_compat.pyc +#usr/lib/python2.7/site-packages/docutils/core.py +#usr/lib/python2.7/site-packages/docutils/core.pyc +#usr/lib/python2.7/site-packages/docutils/examples.py +#usr/lib/python2.7/site-packages/docutils/examples.pyc +#usr/lib/python2.7/site-packages/docutils/frontend.py +#usr/lib/python2.7/site-packages/docutils/frontend.pyc +#usr/lib/python2.7/site-packages/docutils/io.py +#usr/lib/python2.7/site-packages/docutils/io.pyc +#usr/lib/python2.7/site-packages/docutils/languages +#usr/lib/python2.7/site-packages/docutils/languages/__init__.py +#usr/lib/python2.7/site-packages/docutils/languages/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/languages/af.py +#usr/lib/python2.7/site-packages/docutils/languages/af.pyc +#usr/lib/python2.7/site-packages/docutils/languages/ca.py +#usr/lib/python2.7/site-packages/docutils/languages/ca.pyc +#usr/lib/python2.7/site-packages/docutils/languages/cs.py +#usr/lib/python2.7/site-packages/docutils/languages/cs.pyc +#usr/lib/python2.7/site-packages/docutils/languages/da.py +#usr/lib/python2.7/site-packages/docutils/languages/da.pyc +#usr/lib/python2.7/site-packages/docutils/languages/de.py +#usr/lib/python2.7/site-packages/docutils/languages/de.pyc +#usr/lib/python2.7/site-packages/docutils/languages/en.py +#usr/lib/python2.7/site-packages/docutils/languages/en.pyc +#usr/lib/python2.7/site-packages/docutils/languages/eo.py +#usr/lib/python2.7/site-packages/docutils/languages/eo.pyc +#usr/lib/python2.7/site-packages/docutils/languages/es.py +#usr/lib/python2.7/site-packages/docutils/languages/es.pyc +#usr/lib/python2.7/site-packages/docutils/languages/fi.py +#usr/lib/python2.7/site-packages/docutils/languages/fi.pyc +#usr/lib/python2.7/site-packages/docutils/languages/fr.py +#usr/lib/python2.7/site-packages/docutils/languages/fr.pyc +#usr/lib/python2.7/site-packages/docutils/languages/gl.py +#usr/lib/python2.7/site-packages/docutils/languages/gl.pyc +#usr/lib/python2.7/site-packages/docutils/languages/he.py +#usr/lib/python2.7/site-packages/docutils/languages/he.pyc +#usr/lib/python2.7/site-packages/docutils/languages/it.py +#usr/lib/python2.7/site-packages/docutils/languages/it.pyc +#usr/lib/python2.7/site-packages/docutils/languages/ja.py +#usr/lib/python2.7/site-packages/docutils/languages/ja.pyc +#usr/lib/python2.7/site-packages/docutils/languages/lt.py +#usr/lib/python2.7/site-packages/docutils/languages/lt.pyc +#usr/lib/python2.7/site-packages/docutils/languages/nl.py +#usr/lib/python2.7/site-packages/docutils/languages/nl.pyc +#usr/lib/python2.7/site-packages/docutils/languages/pl.py +#usr/lib/python2.7/site-packages/docutils/languages/pl.pyc +#usr/lib/python2.7/site-packages/docutils/languages/pt_br.py +#usr/lib/python2.7/site-packages/docutils/languages/pt_br.pyc +#usr/lib/python2.7/site-packages/docutils/languages/ru.py +#usr/lib/python2.7/site-packages/docutils/languages/ru.pyc +#usr/lib/python2.7/site-packages/docutils/languages/sk.py +#usr/lib/python2.7/site-packages/docutils/languages/sk.pyc +#usr/lib/python2.7/site-packages/docutils/languages/sv.py +#usr/lib/python2.7/site-packages/docutils/languages/sv.pyc +#usr/lib/python2.7/site-packages/docutils/languages/zh_cn.py +#usr/lib/python2.7/site-packages/docutils/languages/zh_cn.pyc +#usr/lib/python2.7/site-packages/docutils/languages/zh_tw.py +#usr/lib/python2.7/site-packages/docutils/languages/zh_tw.pyc +#usr/lib/python2.7/site-packages/docutils/nodes.py +#usr/lib/python2.7/site-packages/docutils/nodes.pyc +#usr/lib/python2.7/site-packages/docutils/parsers +#usr/lib/python2.7/site-packages/docutils/parsers/__init__.py +#usr/lib/python2.7/site-packages/docutils/parsers/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/null.py +#usr/lib/python2.7/site-packages/docutils/parsers/null.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst +#usr/lib/python2.7/site-packages/docutils/parsers/rst/__init__.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/__init__.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/admonitions.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/admonitions.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/body.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/body.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/html.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/html.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/images.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/images.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/misc.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/misc.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/parts.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/parts.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/references.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/references.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/tables.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/tables.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/README.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsa.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsb.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsc.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsn.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamso.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsr.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isobox.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isocyr1.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isocyr2.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isodia.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk1.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk2.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk3.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk4-wide.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk4.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isolat1.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isolat2.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomfrk-wide.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomfrk.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomopf-wide.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomopf.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomscr-wide.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomscr.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isonum.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isopub.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isotech.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlalias.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlextra-wide.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlextra.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/s5defs.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-lat1.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-special.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-symbol.txt +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/__init__.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/af.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/af.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ca.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ca.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/cs.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/cs.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/da.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/da.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/de.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/de.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/en.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/en.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/eo.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/eo.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/es.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/es.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fi.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fi.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fr.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fr.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/gl.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/gl.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/he.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/he.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/it.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/it.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ja.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ja.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/lt.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/lt.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/nl.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/nl.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pl.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pl.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pt_br.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pt_br.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ru.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ru.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sk.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sk.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sv.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sv.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_cn.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_cn.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_tw.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_tw.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/roles.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/roles.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/states.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/states.pyc +#usr/lib/python2.7/site-packages/docutils/parsers/rst/tableparser.py +#usr/lib/python2.7/site-packages/docutils/parsers/rst/tableparser.pyc +#usr/lib/python2.7/site-packages/docutils/readers +#usr/lib/python2.7/site-packages/docutils/readers/__init__.py +#usr/lib/python2.7/site-packages/docutils/readers/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/readers/doctree.py +#usr/lib/python2.7/site-packages/docutils/readers/doctree.pyc +#usr/lib/python2.7/site-packages/docutils/readers/pep.py +#usr/lib/python2.7/site-packages/docutils/readers/pep.pyc +#usr/lib/python2.7/site-packages/docutils/readers/standalone.py +#usr/lib/python2.7/site-packages/docutils/readers/standalone.pyc +#usr/lib/python2.7/site-packages/docutils/statemachine.py +#usr/lib/python2.7/site-packages/docutils/statemachine.pyc +#usr/lib/python2.7/site-packages/docutils/transforms +#usr/lib/python2.7/site-packages/docutils/transforms/__init__.py +#usr/lib/python2.7/site-packages/docutils/transforms/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/components.py +#usr/lib/python2.7/site-packages/docutils/transforms/components.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/frontmatter.py +#usr/lib/python2.7/site-packages/docutils/transforms/frontmatter.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/misc.py +#usr/lib/python2.7/site-packages/docutils/transforms/misc.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/parts.py +#usr/lib/python2.7/site-packages/docutils/transforms/parts.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/peps.py +#usr/lib/python2.7/site-packages/docutils/transforms/peps.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/references.py +#usr/lib/python2.7/site-packages/docutils/transforms/references.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/universal.py +#usr/lib/python2.7/site-packages/docutils/transforms/universal.pyc +#usr/lib/python2.7/site-packages/docutils/transforms/writer_aux.py +#usr/lib/python2.7/site-packages/docutils/transforms/writer_aux.pyc +#usr/lib/python2.7/site-packages/docutils/utils +#usr/lib/python2.7/site-packages/docutils/utils/__init__.py +#usr/lib/python2.7/site-packages/docutils/utils/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/utils/code_analyzer.py +#usr/lib/python2.7/site-packages/docutils/utils/code_analyzer.pyc +#usr/lib/python2.7/site-packages/docutils/utils/error_reporting.py +#usr/lib/python2.7/site-packages/docutils/utils/error_reporting.pyc +#usr/lib/python2.7/site-packages/docutils/utils/math +#usr/lib/python2.7/site-packages/docutils/utils/math/__init__.py +#usr/lib/python2.7/site-packages/docutils/utils/math/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/utils/math/latex2mathml.py +#usr/lib/python2.7/site-packages/docutils/utils/math/latex2mathml.pyc +#usr/lib/python2.7/site-packages/docutils/utils/math/math2html.py +#usr/lib/python2.7/site-packages/docutils/utils/math/math2html.pyc +#usr/lib/python2.7/site-packages/docutils/utils/math/tex2unichar.py +#usr/lib/python2.7/site-packages/docutils/utils/math/tex2unichar.pyc +#usr/lib/python2.7/site-packages/docutils/utils/math/unichar2tex.py +#usr/lib/python2.7/site-packages/docutils/utils/math/unichar2tex.pyc +#usr/lib/python2.7/site-packages/docutils/utils/punctuation_chars.py +#usr/lib/python2.7/site-packages/docutils/utils/punctuation_chars.pyc +#usr/lib/python2.7/site-packages/docutils/utils/roman.py +#usr/lib/python2.7/site-packages/docutils/utils/roman.pyc +#usr/lib/python2.7/site-packages/docutils/utils/smartquotes.py +#usr/lib/python2.7/site-packages/docutils/utils/smartquotes.pyc +#usr/lib/python2.7/site-packages/docutils/utils/urischemes.py +#usr/lib/python2.7/site-packages/docutils/utils/urischemes.pyc +#usr/lib/python2.7/site-packages/docutils/writers +#usr/lib/python2.7/site-packages/docutils/writers/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/docutils_xml.py +#usr/lib/python2.7/site-packages/docutils/writers/docutils_xml.pyc +#usr/lib/python2.7/site-packages/docutils/writers/html4css1 +#usr/lib/python2.7/site-packages/docutils/writers/html4css1/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/html4css1/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/html4css1/html4css1.css +#usr/lib/python2.7/site-packages/docutils/writers/html4css1/math.css +#usr/lib/python2.7/site-packages/docutils/writers/html4css1/template.txt +#usr/lib/python2.7/site-packages/docutils/writers/latex2e +#usr/lib/python2.7/site-packages/docutils/writers/latex2e/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/latex2e/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/latex2e/default.tex +#usr/lib/python2.7/site-packages/docutils/writers/latex2e/titlepage.tex +#usr/lib/python2.7/site-packages/docutils/writers/latex2e/xelatex.tex +#usr/lib/python2.7/site-packages/docutils/writers/manpage.py +#usr/lib/python2.7/site-packages/docutils/writers/manpage.pyc +#usr/lib/python2.7/site-packages/docutils/writers/null.py +#usr/lib/python2.7/site-packages/docutils/writers/null.pyc +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/pygmentsformatter.py +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/pygmentsformatter.pyc +#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/styles.odt +#usr/lib/python2.7/site-packages/docutils/writers/pep_html +#usr/lib/python2.7/site-packages/docutils/writers/pep_html/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/pep_html/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/pep_html/pep.css +#usr/lib/python2.7/site-packages/docutils/writers/pep_html/template.txt +#usr/lib/python2.7/site-packages/docutils/writers/pseudoxml.py +#usr/lib/python2.7/site-packages/docutils/writers/pseudoxml.pyc +#usr/lib/python2.7/site-packages/docutils/writers/s5_html +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/__init__.pyc +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/README.txt +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/__base__ +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/framing.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white/framing.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/blank.gif +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/framing.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/iepngfix.htc +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/opera.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/outline.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/print.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/s5-core.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/slides.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/slides.js +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black/__base__ +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white/framing.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black/__base__ +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white/framing.css +#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white/pretty.css +#usr/lib/python2.7/site-packages/docutils/writers/xetex +#usr/lib/python2.7/site-packages/docutils/writers/xetex/__init__.py +#usr/lib/python2.7/site-packages/docutils/writers/xetex/__init__.pyc diff --git a/config/rootfiles/common/python-inotify b/config/rootfiles/common/python-inotify new file mode 100644 index 0000000..5fc062a --- /dev/null +++ b/config/rootfiles/common/python-inotify @@ -0,0 +1,20 @@ +#usr/lib/python2.7/site-packages/inotify +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/PKG-INFO +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/SOURCES.txt +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/dependency_links.txt +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/not-zip-safe +#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/top_level.txt +usr/lib/python2.7/site-packages/inotify/__init__.py +usr/lib/python2.7/site-packages/inotify/__init__.pyc +usr/lib/python2.7/site-packages/inotify/adapters.py +usr/lib/python2.7/site-packages/inotify/adapters.pyc +usr/lib/python2.7/site-packages/inotify/calls.py +usr/lib/python2.7/site-packages/inotify/calls.pyc +usr/lib/python2.7/site-packages/inotify/constants.py +usr/lib/python2.7/site-packages/inotify/constants.pyc +usr/lib/python2.7/site-packages/inotify/library.py +usr/lib/python2.7/site-packages/inotify/library.pyc +#usr/lib/python2.7/site-packages/inotify/resources +#usr/lib/python2.7/site-packages/inotify/resources/README.rst +#usr/lib/python2.7/site-packages/inotify/resources/requirements.txt diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound new file mode 100644 index 0000000..94eeba7 --- /dev/null +++ b/config/rootfiles/common/unbound @@ -0,0 +1,62 @@ +etc/rc.d/init.d/unbound +#etc/unbound +etc/unbound/dhcp-leases.conf +etc/unbound/forward.conf +etc/unbound/icannbundle.pem +etc/unbound/local.d +etc/unbound/root.hints +etc/unbound/root.key +etc/unbound/unbound.conf +#usr/include/unbound.h +#usr/lib/libunbound.la +#usr/lib/libunbound.so +usr/lib/libunbound.so.2 +usr/lib/libunbound.so.2.4.1 +usr/sbin/unbound +usr/sbin/unbound-anchor +usr/sbin/unbound-checkconf +usr/sbin/unbound-dhcp-leases-bridge +usr/sbin/unbound-control +usr/sbin/unbound-control-setup +usr/sbin/unbound-switch +usr/sbin/unbound-zone +#usr/share/man/man1/unbound-host.1 +#usr/share/man/man3/libunbound.3 +#usr/share/man/man3/ub_cancel.3 +#usr/share/man/man3/ub_ctx.3 +#usr/share/man/man3/ub_ctx_add_ta.3 +#usr/share/man/man3/ub_ctx_add_ta_file.3 +#usr/share/man/man3/ub_ctx_async.3 +#usr/share/man/man3/ub_ctx_config.3 +#usr/share/man/man3/ub_ctx_create.3 +#usr/share/man/man3/ub_ctx_data_add.3 +#usr/share/man/man3/ub_ctx_data_remove.3 +#usr/share/man/man3/ub_ctx_debuglevel.3 +#usr/share/man/man3/ub_ctx_debugout.3 +#usr/share/man/man3/ub_ctx_delete.3 +#usr/share/man/man3/ub_ctx_get_option.3 +#usr/share/man/man3/ub_ctx_hosts.3 +#usr/share/man/man3/ub_ctx_print_local_zones.3 +#usr/share/man/man3/ub_ctx_resolvconf.3 +#usr/share/man/man3/ub_ctx_set_fwd.3 +#usr/share/man/man3/ub_ctx_set_option.3 +#usr/share/man/man3/ub_ctx_trustedkeys.3 +#usr/share/man/man3/ub_ctx_zone_add.3 +#usr/share/man/man3/ub_ctx_zone_remove.3 +#usr/share/man/man3/ub_fd.3 +#usr/share/man/man3/ub_poll.3 +#usr/share/man/man3/ub_process.3 +#usr/share/man/man3/ub_resolve.3 +#usr/share/man/man3/ub_resolve_async.3 +#usr/share/man/man3/ub_resolve_free.3 +#usr/share/man/man3/ub_result.3 +#usr/share/man/man3/ub_strerror.3 +#usr/share/man/man3/ub_wait.3 +#usr/share/man/man5/unbound.conf.5 +#usr/share/man/man8/unbound-anchor.8 +#usr/share/man/man8/unbound-checkconf.8 +#usr/share/man/man8/unbound-control-setup.8 +#usr/share/man/man8/unbound-control.8 +#usr/share/man/man8/unbound.8 +var/lib/unbound +var/lib/unbound/root.key diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index ee5a4ab..2053bd9 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -27,7 +27,6 @@ etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay #etc/rc.d/init.d/dnsdist -etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail etc/rc.d/init.d/fireinfo @@ -78,7 +77,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn @@ -86,7 +85,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/unbound/icannbundle.pem b/config/unbound/icannbundle.pem new file mode 100644 index 0000000..48941de --- /dev/null +++ b/config/unbound/icannbundle.pem @@ -0,0 +1,317 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=ICANN, OU=ICANN Certification Authority, CN=ICANN Root CA, C=US + Validity + Not Before: Dec 23 04:19:12 2009 GMT + Not After : Dec 18 04:19:12 2029 GMT + Subject: O=ICANN, OU=ICANN Certification Authority, CN=ICANN Root CA, C=US + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (2048 bit) + Modulus (2048 bit): + 00:a0:db:70:b8:4f:34:da:9c:d4:d0:7e:bb:ea:15: + bc:e9:c9:11:2a:1f:61:2f:6a:b9:bd:3f:3d:76:a0: + 9a:0a:f7:ee:93:6e:6e:55:53:84:8c:f2:2c:f1:82: + 27:c8:0f:9a:cf:52:1b:54:da:28:d2:2c:30:8e:dd: + fb:92:20:33:2d:d6:c8:f1:0e:10:21:88:71:fa:84: + 22:4b:5d:47:56:16:7c:9b:9f:5d:c3:11:79:9c:14: + e2:ff:c0:74:ac:dd:39:d7:e0:38:d8:b0:73:aa:fb: + d1:db:84:af:52:22:a8:f6:d5:9b:94:f4:e6:5d:5e: + e8:3f:87:90:0b:c7:1a:77:f5:2e:d3:8f:1a:ce:02: + 1d:07:69:21:47:32:da:46:ae:00:4c:b6:a5:a2:9c: + 39:c1:c0:4a:f6:d3:1c:ae:d3:6d:bb:c7:18:f0:7e: + ed:f6:80:ce:d0:01:2e:89:de:12:ba:ee:11:cb:a6: + 7a:d7:0d:7c:f3:08:8d:72:9d:bf:55:75:13:70:bb: + 31:22:4a:cb:e8:c0:aa:a4:09:aa:36:68:40:60:74: + 9d:e7:19:81:43:22:52:fe:c9:2b:52:0f:41:13:36: + 09:72:65:95:cc:89:ae:6f:56:17:16:34:73:52:a3: + 04:ed:bd:88:82:8a:eb:d7:dc:82:52:9c:06:e1:52: + 85:41 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment, Key Agreement, Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + BA:52:E9:49:83:24:86:52:2F:C7:99:CD:FC:8D:6B:69:08:4D:C0:50 + Signature Algorithm: sha256WithRSAEncryption + 0f:f1:e9:82:a2:0a:87:9f:2d:94:60:5a:b2:c0:4b:a1:2f:2b: + 3b:47:d5:0a:99:86:38:b2:ec:c6:3b:89:e4:6e:07:cf:14:c7: + c7:e8:cf:99:8f:aa:30:c3:19:70:b9:e6:6d:d6:3f:c8:68:26: + b2:a0:a5:37:42:ca:d8:62:80:d1:a2:5a:48:2e:1f:85:3f:0c: + 7b:c2:c7:94:11:5f:19:2a:95:ac:a0:3a:03:d8:91:5b:2e:0d: + 9c:7c:1f:2e:fc:e9:44:e1:16:26:73:1c:45:4a:65:c1:83:4c: + 90:f3:f2:28:42:df:db:c4:e7:04:12:18:62:43:5e:bc:1f:6c: + 84:e6:bc:49:32:df:61:d7:99:ee:e4:90:52:7b:0a:c2:91:8a: + 98:62:66:b1:c8:e0:b7:5a:b5:46:7c:76:71:54:8e:cc:a4:81: + 5c:19:db:d2:6f:66:b5:bb:2b:ae:6b:c9:74:04:a8:24:de:e8: + c5:d3:fc:2c:1c:d7:8f:db:6a:8d:c9:53:be:5d:50:73:ac:cf: + 1f:93:c0:52:50:5b:a2:4f:fe:ad:65:36:17:46:d1:2d:e5:a2: + 90:66:05:db:29:4e:5d:50:5d:e3:4f:da:a0:8f:f0:6b:e4:16: + 70:dd:7f:f3:77:7d:b9:4e:f9:ec:c3:33:02:d7:e9:63:2f:31: + e7:40:61:a4 +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIBATANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO +TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV +BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA0MTkxMloX +DTI5MTIxODA0MTkxMlowXTEOMAwGA1UEChMFSUNBTk4xJjAkBgNVBAsTHUlDQU5O +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1JQ0FOTiBSb290IENB +MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKDb +cLhPNNqc1NB+u+oVvOnJESofYS9qub0/PXagmgr37pNublVThIzyLPGCJ8gPms9S +G1TaKNIsMI7d+5IgMy3WyPEOECGIcfqEIktdR1YWfJufXcMReZwU4v/AdKzdOdfg +ONiwc6r70duEr1IiqPbVm5T05l1e6D+HkAvHGnf1LtOPGs4CHQdpIUcy2kauAEy2 +paKcOcHASvbTHK7TbbvHGPB+7faAztABLoneErruEcumetcNfPMIjXKdv1V1E3C7 +MSJKy+jAqqQJqjZoQGB0necZgUMiUv7JK1IPQRM2CXJllcyJrm9WFxY0c1KjBO29 +iIKK69fcglKcBuFShUECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B +Af8EBAMCAf4wHQYDVR0OBBYEFLpS6UmDJIZSL8eZzfyNa2kITcBQMA0GCSqGSIb3 +DQEBCwUAA4IBAQAP8emCogqHny2UYFqywEuhLys7R9UKmYY4suzGO4nkbgfPFMfH +6M+Zj6owwxlwueZt1j/IaCayoKU3QsrYYoDRolpILh+FPwx7wseUEV8ZKpWsoDoD +2JFbLg2cfB8u/OlE4RYmcxxFSmXBg0yQ8/IoQt/bxOcEEhhiQ168H2yE5rxJMt9h +15nu5JBSewrCkYqYYmaxyOC3WrVGfHZxVI7MpIFcGdvSb2a1uyuua8l0BKgk3ujF +0/wsHNeP22qNyVO+XVBzrM8fk8BSUFuiT/6tZTYXRtEt5aKQZgXbKU5dUF3jT9qg +j/Br5BZw3X/zd325TvnswzMC1+ljLzHnQGGk +-----END CERTIFICATE----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 2 (0x2) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=ICANN, OU=ICANN Certification Authority, CN=ICANN Root CA, C=US + Validity + Not Before: Dec 23 04:45:04 2009 GMT + Not After : Dec 22 04:45:04 2014 GMT + Subject: O=ICANN, CN=ICANN DNSSEC CA/emailAddress=dnssec(a)icann.org + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (2048 bit) + Modulus (2048 bit): + 00:c0:bf:e2:b4:ee:12:46:36:3b:7c:d2:46:21:64: + 5a:93:e1:e3:02:10:25:bb:a5:30:70:19:89:98:7e: + 9e:db:8e:0f:ac:c8:48:66:0e:1a:f8:81:e5:2d:3c: + 7b:39:39:76:28:8f:ee:0a:a7:dd:64:e9:5f:87:25: + b1:64:e5:59:03:fc:bc:29:3b:63:37:c8:d7:46:9a: + b6:ce:87:55:cd:cf:e2:ab:e9:c7:8a:53:2e:25:87: + b0:98:d6:20:a3:a8:ec:87:b0:39:a3:c4:c5:75:59: + 3c:fb:91:03:fa:ee:7f:e9:2b:b6:70:88:69:2c:e6: + f1:4f:fc:d0:47:b4:e9:a0:2c:fa:0c:c3:84:eb:be: + 73:5a:bc:16:ed:d0:83:02:2d:eb:6a:21:02:51:70: + 29:1e:4f:c9:69:03:9f:91:32:5c:2c:1a:9f:5e:45: + 48:2a:50:ee:72:14:ec:17:29:fc:20:95:7d:22:6a: + c6:6f:83:a2:58:8e:b1:64:c8:73:23:54:6c:69:1d: + 66:1f:df:f8:4f:24:a1:a8:ae:00:7f:e9:89:41:a6: + e3:88:1d:3a:e1:b3:3a:ef:29:45:32:9b:94:2e:b7: + 6c:1e:fe:31:40:13:e1:bd:52:67:d0:d8:c3:3e:03: + 84:48:72:9d:bd:8a:48:a0:f2:72:35:b6:03:4b:c6: + e9:05 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment, Key Agreement, Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:BA:52:E9:49:83:24:86:52:2F:C7:99:CD:FC:8D:6B:69:08:4D:C0:50 + + X509v3 Subject Key Identifier: + 8F:B2:42:69:C3:9D:E4:3C:FA:13:B9:FF:F2:C0:A4:EF:D8:0F:E8:22 + Signature Algorithm: sha256WithRSAEncryption + 4a:78:a2:47:7e:3f:2e:4d:78:68:ab:06:5c:ff:da:01:04:45: + 92:20:20:88:f3:dc:4e:70:01:9b:cb:f3:13:61:34:04:09:15: + d0:be:99:1c:be:fc:97:e9:2d:73:e1:b3:2b:a6:b9:3a:41:33: + f3:83:3d:64:1b:64:95:bf:ae:cd:20:df:18:e0:62:8d:fa:9c: + f7:d8:a9:3c:25:2b:8e:cf:10:e5:29:b9:af:1a:7f:62:64:75: + e7:c6:fd:9b:6d:71:c0:a9:b3:0f:9a:b7:7a:fe:53:04:18:cd: + 04:06:d9:bf:01:0e:cc:04:84:84:51:a3:e9:06:2a:a3:25:73: + 4e:8d:62:19:13:25:5b:de:0b:dc:d0:69:01:ca:41:0a:96:13: + cf:6a:11:fe:2b:9a:3f:fd:56:3d:73:3d:58:49:c2:71:83:20: + 23:6d:46:99:6e:37:91:9f:76:2a:9c:b0:69:3f:64:9f:05:bb: + 38:c8:1e:ca:d8:6c:fd:56:3e:a6:85:a2:53:80:c6:42:b6:79: + c6:43:0b:e0:6c:ea:9f:cf:b0:2a:2c:01:50:c3:d8:0f:a0:7e: + a1:73:a8:5c:84:27:5b:c9:4b:5a:13:e9:69:25:1c:59:11:d2: + 01:dc:da:e7:c8:44:34:a2:e4:99:25:b4:c3:23:b5:f8:2d:48: + e5:8d:06:73 +-----BEGIN CERTIFICATE----- +MIIDhjCCAm6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO +TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV +BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA0NDUwNFoX +DTE0MTIyMjA0NDUwNFowSzEOMAwGA1UEChMFSUNBTk4xGDAWBgNVBAMTD0lDQU5O +IEROU1NFQyBDQTEfMB0GCSqGSIb3DQEJARMQZG5zc2VjQGljYW5uLm9yZzCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMC/4rTuEkY2O3zSRiFkWpPh4wIQ +JbulMHAZiZh+ntuOD6zISGYOGviB5S08ezk5diiP7gqn3WTpX4clsWTlWQP8vCk7 +YzfI10aats6HVc3P4qvpx4pTLiWHsJjWIKOo7IewOaPExXVZPPuRA/ruf+krtnCI +aSzm8U/80Ee06aAs+gzDhOu+c1q8Fu3QgwIt62ohAlFwKR5PyWkDn5EyXCwan15F +SCpQ7nIU7Bcp/CCVfSJqxm+DoliOsWTIcyNUbGkdZh/f+E8koaiuAH/piUGm44gd +OuGzOu8pRTKblC63bB7+MUAT4b1SZ9DYwz4DhEhynb2KSKDycjW2A0vG6QUCAwEA +AaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAf4wHwYDVR0jBBgw +FoAUulLpSYMkhlIvx5nN/I1raQhNwFAwHQYDVR0OBBYEFI+yQmnDneQ8+hO5//LA +pO/YD+giMA0GCSqGSIb3DQEBCwUAA4IBAQBKeKJHfj8uTXhoqwZc/9oBBEWSICCI +89xOcAGby/MTYTQECRXQvpkcvvyX6S1z4bMrprk6QTPzgz1kG2SVv67NIN8Y4GKN ++pz32Kk8JSuOzxDlKbmvGn9iZHXnxv2bbXHAqbMPmrd6/lMEGM0EBtm/AQ7MBISE +UaPpBiqjJXNOjWIZEyVb3gvc0GkBykEKlhPPahH+K5o//VY9cz1YScJxgyAjbUaZ +bjeRn3YqnLBpP2SfBbs4yB7K2Gz9Vj6mhaJTgMZCtnnGQwvgbOqfz7AqLAFQw9gP +oH6hc6hchCdbyUtaE+lpJRxZEdIB3NrnyEQ0ouSZJbTDI7X4LUjljQZz +-----END CERTIFICATE----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 6 (0x6) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=ICANN, OU=ICANN Certification Authority, CN=ICANN Root CA, C=US + Validity + Not Before: Dec 23 05:21:16 2009 GMT + Not After : Dec 22 05:21:16 2014 GMT + Subject: O=ICANN, CN=ICANN EMAIL CA + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (2048 bit) + Modulus (2048 bit): + 00:d2:19:1e:22:69:33:f6:a4:d2:76:c5:80:11:75: + 8e:d0:e8:6f:bf:89:f8:2a:6a:da:8a:85:28:40:ba: + c5:23:5f:47:ed:72:e2:8e:d3:5c:c8:8a:3a:99:a9: + 57:2c:0a:2b:22:f3:54:7b:8b:f7:8c:21:a2:50:01: + 4f:8b:af:34:df:72:fc:78:31:d0:1d:eb:bc:9b:e6: + fa:c1:84:d0:05:07:8a:74:53:a5:60:9e:eb:75:9e: + a8:5d:32:c8:02:32:e4:bf:cb:97:9b:7a:fa:2c:f6: + 6a:1d:b8:57:ad:e3:03:22:93:d0:f4:4f:a8:b8:01: + db:82:33:98:b6:87:ed:3d:67:40:00:27:2e:d5:95: + d2:ad:36:46:14:c6:17:79:65:7f:65:f3:88:80:65: + 7c:22:67:08:23:3c:cf:a5:10:38:72:30:97:92:6f: + 20:4a:ba:24:4c:4a:c8:4a:a5:dc:2a:44:a1:29:78: + b4:9f:fe:84:ff:27:5b:3a:72:ea:31:c1:ad:06:22: + d6:44:a0:4a:57:32:9c:f2:46:47:d0:89:6e:20:23: + 2c:ea:b0:83:7e:c1:f3:ea:da:dd:e3:63:59:97:21: + fa:1b:11:39:27:cf:82:8b:56:15:d4:36:92:0c:a5: + 7e:80:e0:18:c9:50:08:42:0a:df:97:3c:9c:b8:0a: + 4d:b1 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment, Key Agreement, Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:BA:52:E9:49:83:24:86:52:2F:C7:99:CD:FC:8D:6B:69:08:4D:C0:50 + + X509v3 Subject Key Identifier: + 7B:3F:BA:CE:A1:B3:A6:13:2E:5A:82:84:D4:D2:EA:A5:24:F1:CD:B4 + Signature Algorithm: sha256WithRSAEncryption + 50:07:a5:61:39:e4:3b:e3:bc:1c:b4:a7:b2:ab:a1:fb:47:bf: + b4:1c:32:ac:3c:46:b0:02:26:2f:16:3e:89:70:e2:87:e9:76: + 99:61:0b:91:c5:48:7a:e5:aa:24:0b:39:e0:4f:26:03:d4:5b: + 01:8a:4d:b6:98:cc:16:fa:e2:12:4a:88:b9:53:bb:50:2d:c7: + 37:b8:a3:82:2d:52:05:3e:46:a7:db:97:82:73:8d:7d:ed:dd: + 9e:37:73:68:6b:90:cd:62:d8:77:ff:32:53:bb:d3:a1:b9:cb: + 7d:32:29:70:fb:2e:90:4b:27:12:6d:99:a5:e6:d4:ef:13:32: + c1:2f:b5:ae:6e:11:0e:50:56:a4:56:5b:76:b0:c0:99:2e:5a: + 94:17:ee:2b:c1:b6:9c:8b:68:ac:55:95:31:8c:66:2b:35:43: + a5:13:04:1b:50:44:1c:55:7f:4c:d0:1a:50:80:53:45:a8:e3: + d3:a8:74:ad:7d:6a:d6:e9:9a:d3:25:7d:83:e2:57:64:1a:94: + 7e:bc:cb:ef:79:b5:54:6a:f1:b0:c3:81:26:90:e5:40:87:ed: + 75:7d:83:63:5b:ab:45:c0:34:04:27:e8:d8:12:26:7c:5e:c0: + 48:b6:33:7d:4b:db:23:8a:f7:13:24:bc:be:7b:74:cb:c4:ed: + ed:42:eb:2f +-----BEGIN CERTIFICATE----- +MIIDZDCCAkygAwIBAgIBBjANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO +TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV +BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA1MjExNloX +DTE0MTIyMjA1MjExNlowKTEOMAwGA1UEChMFSUNBTk4xFzAVBgNVBAMTDklDQU5O +IEVNQUlMIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0hkeImkz +9qTSdsWAEXWO0Ohvv4n4KmraioUoQLrFI19H7XLijtNcyIo6malXLAorIvNUe4v3 +jCGiUAFPi68033L8eDHQHeu8m+b6wYTQBQeKdFOlYJ7rdZ6oXTLIAjLkv8uXm3r6 +LPZqHbhXreMDIpPQ9E+ouAHbgjOYtoftPWdAACcu1ZXSrTZGFMYXeWV/ZfOIgGV8 +ImcIIzzPpRA4cjCXkm8gSrokTErISqXcKkShKXi0n/6E/ydbOnLqMcGtBiLWRKBK +VzKc8kZH0IluICMs6rCDfsHz6trd42NZlyH6GxE5J8+Ci1YV1DaSDKV+gOAYyVAI +QgrflzycuApNsQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIB/jAfBgNVHSMEGDAWgBS6UulJgySGUi/Hmc38jWtpCE3AUDAdBgNVHQ4EFgQU +ez+6zqGzphMuWoKE1NLqpSTxzbQwDQYJKoZIhvcNAQELBQADggEBAFAHpWE55Dvj +vBy0p7KroftHv7QcMqw8RrACJi8WPolw4ofpdplhC5HFSHrlqiQLOeBPJgPUWwGK +TbaYzBb64hJKiLlTu1Atxze4o4ItUgU+Rqfbl4JzjX3t3Z43c2hrkM1i2Hf/MlO7 +06G5y30yKXD7LpBLJxJtmaXm1O8TMsEvta5uEQ5QVqRWW3awwJkuWpQX7ivBtpyL +aKxVlTGMZis1Q6UTBBtQRBxVf0zQGlCAU0Wo49OodK19atbpmtMlfYPiV2QalH68 +y+95tVRq8bDDgSaQ5UCH7XV9g2Nbq0XANAQn6NgSJnxewEi2M31L2yOK9xMkvL57 +dMvE7e1C6y8= +-----END CERTIFICATE----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 3 (0x3) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=ICANN, OU=ICANN Certification Authority, CN=ICANN Root CA, C=US + Validity + Not Before: Dec 23 05:07:29 2009 GMT + Not After : Dec 22 05:07:29 2014 GMT + Subject: O=ICANN, CN=ICANN SSL CA + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (2048 bit) + Modulus (2048 bit): + 00:dd:c6:ab:bf:7c:66:9d:b3:2b:96:00:14:c7:60: + 7a:8d:62:5b:26:4b:30:d7:b3:4c:82:69:c6:4d:4d: + 73:f3:d4:91:21:5d:ab:35:f0:c8:04:0e:f4:a3:35: + e2:e1:18:a9:98:12:03:58:f8:9f:eb:77:54:5b:89: + 81:26:c9:aa:c2:f4:c9:0c:82:57:2a:5e:05:e9:61: + 17:cc:19:18:71:eb:35:83:c1:86:9d:ec:f1:6b:ca: + dd:a1:96:0b:95:d4:e1:0f:9e:24:6f:dc:3c:d0:28: + 9e:f2:53:47:2b:a1:ad:32:03:c8:3f:0d:80:80:7d: + f0:02:d2:6e:5a:2c:44:21:9b:09:50:15:3f:a1:3d: + d3:c9:c8:24:e7:ea:4e:92:2f:94:90:2e:de:e7:68: + f6:c6:b3:90:1f:bc:c9:7b:a2:65:d7:11:e9:8b:f0: + 3a:5a:b7:17:07:df:69:e3:6e:b9:54:6a:8e:3a:aa: + 94:7f:2c:0a:a1:ad:ba:b7:d9:60:62:27:a7:71:40: + 3b:8e:b0:84:7b:b8:c8:67:ef:66:ba:3d:ac:c3:85: + e5:86:bb:a7:9c:fd:b6:e1:c0:10:53:3d:d4:7e:1b: + 09:e6:9f:22:5c:a7:27:09:7e:27:12:33:fa:df:9b: + 20:2f:14:f7:17:c0:e4:1e:07:91:1f:f9:9a:cd:a8: + e2:c5 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment, Key Agreement, Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:BA:52:E9:49:83:24:86:52:2F:C7:99:CD:FC:8D:6B:69:08:4D:C0:50 + + X509v3 Subject Key Identifier: + 6E:77:A8:40:10:4A:D8:9C:0C:F2:B7:5A:3A:A5:2F:79:4A:61:14:D8 + Signature Algorithm: sha256WithRSAEncryption + 18:42:62:df:aa:8e:44:e6:87:10:4d:d9:a6:b2:c3:97:37:43: + 2e:ce:f3:e0:3c:c2:2f:e1:78:60:41:a9:2b:5d:f4:24:f5:f6: + 57:a2:08:ec:9c:89:e5:54:50:a8:30:c6:20:e5:8a:c7:8b:bd: + fd:98:b6:0c:7d:1a:1f:01:a1:4a:4e:ec:0d:2a:aa:9f:fd:a9: + 20:0d:b3:5c:0f:36:c0:2c:2b:c6:75:22:29:66:a3:34:bd:93: + 3d:f6:28:da:90:d5:7e:91:df:d3:06:f6:69:8b:80:9b:a5:34: + af:6a:02:5b:e4:52:7d:56:4d:99:6e:fe:e9:d0:36:99:58:d9: + af:cd:79:9b:e5:d2:4c:35:90:d3:e0:68:b2:88:2b:18:39:2e: + bc:0b:d9:82:84:7f:24:12:92:d2:b9:13:4f:64:bc:46:e1:5c: + 6a:ed:f7:b0:d4:66:27:25:21:86:b4:3a:5e:19:a3:c7:8b:4b: + 93:b9:2e:37:e2:6d:8b:46:ee:68:39:21:75:e8:fe:2a:a7:85: + fd:68:26:96:bd:dd:f9:f1:fe:99:5f:b4:a4:97:1b:50:18:fa: + 21:90:54:0c:8b:30:28:94:70:19:34:9e:5c:e1:e5:48:93:af: + aa:a3:b4:95:b2:f5:4c:97:50:44:58:97:e1:ff:e7:b2:10:dd: + 2c:fe:c0:ed +-----BEGIN CERTIFICATE----- +MIIDYjCCAkqgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO +TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV +BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA1MDcyOVoX +DTE0MTIyMjA1MDcyOVowJzEOMAwGA1UEChMFSUNBTk4xFTATBgNVBAMTDElDQU5O +IFNTTCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3Gq798Zp2z +K5YAFMdgeo1iWyZLMNezTIJpxk1Nc/PUkSFdqzXwyAQO9KM14uEYqZgSA1j4n+t3 +VFuJgSbJqsL0yQyCVypeBelhF8wZGHHrNYPBhp3s8WvK3aGWC5XU4Q+eJG/cPNAo +nvJTRyuhrTIDyD8NgIB98ALSblosRCGbCVAVP6E908nIJOfqTpIvlJAu3udo9saz +kB+8yXuiZdcR6YvwOlq3FwffaeNuuVRqjjqqlH8sCqGturfZYGInp3FAO46whHu4 +yGfvZro9rMOF5Ya7p5z9tuHAEFM91H4bCeafIlynJwl+JxIz+t+bIC8U9xfA5B4H +kR/5ms2o4sUCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +Af4wHwYDVR0jBBgwFoAUulLpSYMkhlIvx5nN/I1raQhNwFAwHQYDVR0OBBYEFG53 +qEAQSticDPK3WjqlL3lKYRTYMA0GCSqGSIb3DQEBCwUAA4IBAQAYQmLfqo5E5ocQ +TdmmssOXN0MuzvPgPMIv4XhgQakrXfQk9fZXogjsnInlVFCoMMYg5YrHi739mLYM +fRofAaFKTuwNKqqf/akgDbNcDzbALCvGdSIpZqM0vZM99ijakNV+kd/TBvZpi4Cb +pTSvagJb5FJ9Vk2Zbv7p0DaZWNmvzXmb5dJMNZDT4GiyiCsYOS68C9mChH8kEpLS +uRNPZLxG4Vxq7few1GYnJSGGtDpeGaPHi0uTuS434m2LRu5oOSF16P4qp4X9aCaW +vd358f6ZX7SklxtQGPohkFQMizAolHAZNJ5c4eVIk6+qo7SVsvVMl1BEWJfh/+ey +EN0s/sDt +-----END CERTIFICATE----- diff --git a/config/unbound/root.hints b/config/unbound/root.hints new file mode 100644 index 0000000..3c82146 --- /dev/null +++ b/config/unbound/root.hints @@ -0,0 +1,90 @@ +; This file holds the information on root name servers needed to +; initialize cache of Internet domain name servers +; (e.g. reference this file in the "cache . <file>" +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC +; under anonymous FTP as +; file /domain/named.cache +; on server FTP.INTERNIC.NET +; -OR- RS.INTERNIC.NET +; +; last update: March 23, 2016 +; related version of root zone: 2016032301 +; +; formerly NS.INTERNIC.NET +; +. 3600000 NS A.ROOT-SERVERS.NET. +A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 +A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU +; +. 3600000 NS B.ROOT-SERVERS.NET. +B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +; +; FORMERLY C.PSI.NET +; +. 3600000 NS C.ROOT-SERVERS.NET. +C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU +; +. 3600000 NS D.ROOT-SERVERS.NET. +D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d +; +; FORMERLY NS.NASA.GOV +; +. 3600000 NS E.ROOT-SERVERS.NET. +E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +; +; FORMERLY NS.ISC.ORG +; +. 3600000 NS F.ROOT-SERVERS.NET. +F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +; +; FORMERLY NS.NIC.DDN.MIL +; +. 3600000 NS G.ROOT-SERVERS.NET. +G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +; +; FORMERLY AOS.ARL.ARMY.MIL +; +. 3600000 NS H.ROOT-SERVERS.NET. +H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 +; +; FORMERLY NIC.NORDU.NET +; +. 3600000 NS I.ROOT-SERVERS.NET. +I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 +; +; OPERATED BY VERISIGN, INC. +; +. 3600000 NS J.ROOT-SERVERS.NET. +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 +J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 +; +; OPERATED BY RIPE NCC +; +. 3600000 NS K.ROOT-SERVERS.NET. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +; +; OPERATED BY ICANN +; +. 3600000 NS L.ROOT-SERVERS.NET. +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 +; +; OPERATED BY WIDE +; +. 3600000 NS M.ROOT-SERVERS.NET. +M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +; End of file diff --git a/config/unbound/root.key b/config/unbound/root.key new file mode 100644 index 0000000..0c36abe --- /dev/null +++ b/config/unbound/root.key @@ -0,0 +1 @@ +. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge new file mode 100644 index 0000000..61bd5d0 --- /dev/null +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -0,0 +1,354 @@ +#!/usr/bin/python +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2016 Michael Tremer # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +import argparse +import datetime +import daemon +import logging +import logging.handlers +import re +import signal +import subprocess + +import inotify.adapters + +def setup_logging(loglevel=logging.INFO): + log = logging.getLogger("dhcp") + log.setLevel(loglevel) + + handler = logging.handlers.SysLogHandler(address="/dev/log", facility="daemon") + handler.setLevel(loglevel) + + formatter = logging.Formatter("%(name)s[%(process)d]: %(message)s") + handler.setFormatter(formatter) + + log.addHandler(handler) + + return log + +log = logging.getLogger("dhcp") + +class UnboundDHCPLeasesBridge(object): + def __init__(self, dhcp_leases_file, unbound_leases_file): + self.leases_file = dhcp_leases_file + + self.unbound = UnboundConfigWriter(unbound_leases_file) + self.running = False + + def run(self): + log.info("Unbound DHCP Leases Bridge started on %s" % self.leases_file) + self.running = True + + # Initially read leases file + self.update_dhcp_leases() + + i = inotify.adapters.Inotify([self.leases_file]) + + for event in i.event_gen(): + # End if we are requested to terminate + if not self.running: + break + + if event is None: + continue + + header, type_names, watch_path, filename = event + + # Update leases after leases file has been modified + if "IN_MODIFY" in type_names: + self.update_dhcp_leases() + + log.info("Unbound DHCP Leases Bridge terminated") + + def update_dhcp_leases(self): + log.info("Reading DHCP leases from %s" % self.leases_file) + + leases = DHCPLeases(self.leases_file) + self.unbound.update_dhcp_leases(leases) + + def terminate(self): + self.running = False + + +class DHCPLeases(object): + regex_leaseblock = re.compile(r"lease (?P<ipaddr>\d+\.\d+\.\d+\.\d+) {(?P<config>[\s\S]+?)\n}") + + def __init__(self, path): + self.path = path + + self._leases = self._parse() + + def __iter__(self): + return iter(self._leases) + + def _parse(self): + leases = [] + + with open(self.path) as f: + # Read entire leases file + data = f.read() + + for match in self.regex_leaseblock.finditer(data): + block = match.groupdict() + + ipaddr = block.get("ipaddr") + config = block.get("config") + + properties = self._parse_block(config) + + # Skip any abandoned leases + if not "hardware" in properties: + continue + + lease = Lease(ipaddr, properties) + + # Check if a lease for this Ethernet address already + # exists in the list of known leases. If so replace + # if with the most recent lease + for i, l in enumerate(leases): + if l.hwaddr == lease.hwaddr: + leases[i] = max(lease, l) + break + + else: + leases.append(lease) + + return leases + + def _parse_block(self, block): + properties = {} + + for line in block.splitlines(): + if not line: + continue + + # Remove trailing ; from line + if line.endswith(";"): + line = line[:-1] + + # Invalid line if it doesn't end with ; + else: + continue + + # Remove any leading whitespace + line = line.lstrip() + + # We skip all options and sets + if line.startswith("option") or line.startswith("set"): + continue + + # Split by first space + key, val = line.split(" ", 1) + properties[key] = val + + return properties + + +class Lease(object): + def __init__(self, ipaddr, properties): + self.ipaddr = ipaddr + self._properties = properties + + def __repr__(self): + return "<%s %s for %s (%s)>" % (self.__class__.__name__, + self.ipaddr, self.hwaddr, self.hostname) + + def __eq__(self, other): + return self.ipaddr == other.ipaddr and self.hwaddr == other.hwaddr + + def __gt__(self, other): + if not self.ipaddr == other.ipaddr: + return + + if not self.hwaddr == other.hwaddr: + return + + return self.time_starts > other.time_starts + + @property + def binding_state(self): + state = self._properties.get("binding") + + if state: + state = state.split(" ", 1) + return state[1] + + @property + def active(self): + return self.binding_state == "active" + + @property + def hwaddr(self): + hardware = self._properties.get("hardware") + + if not hardware: + return + + ethernet, address = hardware.split(" ", 1) + + return address + + @property + def hostname(self): + hostname = self._properties.get("client-hostname") + + # Remove any "" + if hostname: + hostname = hostname.replace("\"", "") + + return hostname + + @property + def domain(self): + return "local" # XXX + + @property + def fqdn(self): + return "%s.%s" % (self.hostname, self.domain) + + @staticmethod + def _parse_time(s): + return datetime.datetime.strptime(s, "%w %Y/%m/%d %H:%M:%S") + + @property + def time_starts(self): + starts = self._properties.get("starts") + + if starts: + return self._parse_time(starts) + + @property + def time_ends(self): + ends = self._properties.get("ends") + + if not ends or ends == "never": + return + + return self._parse_time(ends) + + @property + def expired(self): + if not self.time_ends: + return self.time_starts > datetime.datetime.utcnow() + + return self.time_starts > datetime.datetime.utcnow() > self.time_ends + + @property + def rrset(self): + return [ + # Forward record + (self.fqdn, "IN A", self.ipaddr), + + # Reverse record + (self.ipaddr, "IN PTR", self.fqdn), + ] + + +class UnboundConfigWriter(object): + def __init__(self, path): + self.path = path + + self._cached_leases = [] + + def update_dhcp_leases(self, leases): + # Strip all non-active or expired leases + leases = [l for l in leases if l.active and not l.expired] + + # Find any leases that have expired or do not exist any more + removed_leases = [l for l in self._cached_leases if l.expired or l not in leases] + + # Find any leases that have been added + new_leases = [l for l in leases if l not in self._cached_leases] + + # End here if nothing has changed + if not new_leases and not removed_leases: + return + + self._cached_leases = leases + + # Write out all leases + self.write_dhcp_leases(leases) + + # Update unbound about changes + for l in removed_leases: + self._control("local_data_remove", l.fqdn) + + for l in new_leases: + for rr in l.rrset: + self._control("local_data", *rr) + + + def write_dhcp_leases(self, leases): + with open(self.path, "w") as f: + for l in leases: + for rr in l.rrset: + f.write("local-data: \"%s\"\n" % " ".join(rr)) + + def _control(self, *args): + command = ["unbound-control", "-q"] + command.extend(args) + + try: + subprocess.check_call(command) + + # Log any errors + except subprocess.CalledProcessError as e: + log.critical("Could not run %s, error code: %s: %s" % ( + " ".join(command), e.returncode, e.output)) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Bridge for DHCP Leases and Unbound DNS") + + # Daemon Stuff + parser.add_argument("--daemon", "-d", action="store_true", + help="Launch as daemon in background") + parser.add_argument("--verbose", "-v", action="count", help="Be more verbose") + + # Paths + parser.add_argument("--dhcp-leases", default="/var/state/dhcp/dhcpd.leases", + metavar="PATH", help="Path to the DHCPd leases file") + parser.add_argument("--unbound-leases", default="/etc/unbound/dhcp-leases.conf", + metavar="PATH", help="Path to the unbound configuration file") + + # Parse command line arguments + args = parser.parse_args() + + # Setup logging + if args.verbose == 1: + loglevel = logging.INFO + elif args.verbose >= 2: + loglevel = logging.DEBUG + else: + loglevel = logging.WARN + + setup_logging(loglevel) + + bridge = UnboundDHCPLeasesBridge(args.dhcp_leases, args.unbound_leases) + + ctx = daemon.DaemonContext(detach_process=args.daemon) + ctx.signal_map = { + signal.SIGHUP : bridge.update_dhcp_leases, + signal.SIGTERM : bridge.terminate, + } + + with ctx: + bridge.run() diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf new file mode 100644 index 0000000..6d8a7f2 --- /dev/null +++ b/config/unbound/unbound.conf @@ -0,0 +1,94 @@ +# +# Unbound configuration file for IPFire +# +# The full documentation is available at: +# https://www.unbound.net/documentation/unbound.conf.html +# + +server: + # Common Server Options + chroot: "" + directory: "/etc/unbound" + username: "nobody" + port: 53 + do-ip4: yes + do-ip6: no + do-udp: yes + do-tcp: yes + so-reuseport: yes + do-not-query-localhost: yes + + # System Tuning + include: "/etc/unbound/tuning.conf" + + # Logging Options + verbosity: 1 + use-syslog: yes + log-time-ascii: yes + log-queries: no + + # Unbound Statistics + statistics-interval: 0 + statistics-cumulative: yes + extended-statistics: yes + + # Prefetching + prefetch: yes + prefetch-key: yes + + # Randomise any cached responses + rrset-roundrobin: yes + + # Privacy Options + hide-identity: yes + hide-version: yes + qname-minimisation: yes + minimal-responses: yes + + # DNSSEC + auto-trust-anchor-file: "/var/lib/unbound/root.key" + val-permissive-mode: no + val-clean-additional: yes + val-log-level: 1 + + # Hardening Options + harden-glue: yes + harden-short-bufsize: no + harden-large-queries: yes + harden-dnssec-stripped: yes + harden-below-nxdomain: yes + harden-referral-path: yes + harden-algo-downgrade: no + use-caps-for-id: no + + # Deny access from everywhere + access-control: 0.0.0.0/0 refuse + + # Listen on localhost + interface: 127.0.0.1 + access-control: 127.0.0.0/8 allow + + # Bootstrap root servers + root-hints: "/etc/unbound/root.hints" + + # IPFire interface configuration + include: "/etc/unbound/interfaces.conf" + interface-automatic: no + + # Include DHCP leases + include: "/etc/unbound/dhcp-leases.conf" + + # Include any forward zones + include: "/etc/unbound/forward.conf" + +remote-control: + control-enable: yes + control-use-cert: yes + control-interface: 127.0.0.1 + server-key-file: "/etc/unbound/unbound_server.key" + server-cert-file: "/etc/unbound/unbound_server.pem" + control-key-file: "/etc/unbound/unbound_control.key" + control-cert-file: "/etc/unbound/unbound_control.pem" + +# Import any local configurations +include: "/etc/unbound/local.d/*.conf" diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index 1afc55f..ee63c6d 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -106,8 +106,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) $cgiparams{'ID'} = $cgiparams{'EDITING'}; } } - # Restart dnsmasq. - system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); + # Restart unbound + system('/usr/local/bin/unboundctrl restart >/dev/null'); } ### @@ -124,8 +124,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; } } close(FILE); - # Restart dnsmasq. - system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); + # Restart unbound. + system('/usr/local/bin/unboundctrl restart >/dev/null'); } ### @@ -148,8 +148,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) } } close(FILE); - # Restart dnsmasq. - system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); + # Restart unbound. + system('/usr/local/bin/unboundctrl restart >/dev/null'); } ### diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index f954213..82b6aa0 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -52,7 +52,7 @@ my %sections = ( 'ipfire' => '(ipfire: )', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', 'ddns' => '(ddns\[\d+\]:)', - 'dns' => '(dnsmasq\[.*\]: )', + 'dns' => '(dnsmasq\[.*\]: |unbound\[.*\]: )', 'dma' => '(dma\[.*\]: )', 'dhcp' => '(dhcpd: )', 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )', diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 76bd9ed..64fdbba 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -49,7 +49,7 @@ my %servicenames =( $Lang::tr{'dhcp server'} => 'dhcpd', $Lang::tr{'web server'} => 'httpd', $Lang::tr{'cron server'} => 'fcron', - $Lang::tr{'dns proxy server'} => 'dnsmasq', + $Lang::tr{'dns proxy server'} => 'unbound', $Lang::tr{'logging server'} => 'syslogd', $Lang::tr{'kernel logging server'} => 'klogd', $Lang::tr{'ntp server'} => 'ntpd', diff --git a/lfs/dnsmasq b/lfs/dnsmasq deleted file mode 100644 index 7a11061..0000000 --- a/lfs/dnsmasq +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.76 - -THISAPP = dnsmasq-$(VER) -DL_FILE = $(THISAPP).tar.xz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -# We cannot use INOTIFY because our ISC reader code does not support that -COPTS = -DHAVE_ISC_READER -DNO_INOTIFY - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 00f5ee66b4e4b7f14538bf62ae3c9461 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-Check_return_of_expand_always.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/005-Manpage_typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch - - cd $(DIR_APP) && sed -i src/config.h \ - -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \ - -e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \ - -e 's|#define HAVE_DHCP|//#define HAVE_DHCP|g' \ - -e 's|#define HAVE_DHCP6|//#define HAVE_DHCP6|g' \ - -e 's|#define HAVE_TFTP|//#define HAVE_TFTP|g' - - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" \ - PREFIX=/usr all install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/initscripts b/lfs/initscripts index e731d7f..5e2cd24 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -185,13 +185,11 @@ $(TARGET) : ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient - ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq ln -sf ../../../../../usr/local/bin/snortctrl \ /etc/rc.d/init.d/networking/red.up/23-RS-snort ln -sf ../../../../../usr/local/bin/qosctrl \ /etc/rc.d/init.d/networking/red.up/24-RS-qos ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid - ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq for i in green blue orange; do \ ln -sf any /etc/rc.d/init.d/networking/$$i; \ diff --git a/lfs/python-daemon b/lfs/python-daemon new file mode 100644 index 0000000..c96ec55 --- /dev/null +++ b/lfs/python-daemon @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.1.1 + +THISAPP = python-daemon-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 72e2acf2c3d69c7fa75a6625d06adfd0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/python-docutils b/lfs/python-docutils new file mode 100644 index 0000000..13f7ef1 --- /dev/null +++ b/lfs/python-docutils @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.12 + +THISAPP = docutils-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4622263b62c5c771c03502afa3157768 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/python-inotify b/lfs/python-inotify new file mode 100644 index 0000000..ea8a960 --- /dev/null +++ b/lfs/python-inotify @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.2.7 + +THISAPP = inotify-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ced4c0469f9fd64170d9d907e4aec208 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/unbound b/lfs/unbound new file mode 100644 index 0000000..9c85893 --- /dev/null +++ b/lfs/unbound @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.5.9 + +THISAPP = unbound-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 0cefa62c1690b4db18583db84bff00e3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-pidfile=/var/run/unbound.pid \ + --with-rootkey-file=/var/lib/unbound/root.key \ + --disable-static \ + --with-libevent + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Install configuration + install -v -m 644 $(DIR_SRC)/config/unbound/unbound.conf \ + /etc/unbound/unbound.conf + touch /etc/unbound/{dhcp-leases,forward}.conf + -mkdir -pv /etc/unbound/local.d + + # Install root hints + install -v -m 644 $(DIR_SRC)/config/unbound/root.hints \ + /etc/unbound/root.hints + + # Install DHCP leases bridge + install -v -m 755 $(DIR_SRC)/config/unbound/unbound-dhcp-leases-bridge \ + /usr/sbin/unbound-dhcp-leases-bridge + + # Install key + -mkdir -pv /var/lib/unbound + install -v -m 644 $(DIR_SRC)/config/unbound/root.key \ + /var/lib/unbound/root.key + chown -Rv nobody.nobody /var/lib/unbound + + # Ship ICANN's certificates to validate DNS trust anchors + install -v -m 644 $(DIR_SRC)/config/unbound/icannbundle.pem \ + /etc/unbound/icannbundle.pem + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1c832d0..73feacb 100755 --- a/make.sh +++ b/make.sh @@ -537,7 +537,9 @@ buildipfire() { ipfiremake beep ipfiremake dvdrtools ipfiremake nettle - ipfiremake dnsmasq + ipfiremake libevent + ipfiremake libevent2 + ipfiremake unbound ipfiremake dosfstools ipfiremake reiserfsprogs ipfiremake xfsprogs @@ -603,6 +605,9 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler + ipfiremake python-inotify + ipfiremake python-docutils + ipfiremake python-daemon ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -678,8 +683,6 @@ buildipfire() { ipfiremake gnump3d ipfiremake rsync ipfiremake tcpwrapper - ipfiremake libevent - ipfiremake libevent2 ipfiremake libtirpc ipfiremake rpcbind ipfiremake nfs diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq deleted file mode 100644 index 059ffac..0000000 --- a/src/initscripts/init.d/dnsmasq +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/dnsmasq -# -# Description : dnsmasq init script -# -# Authors : Michael Tremer - mitch(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -CACHE_SIZE=2500 -ENABLE_DNSSEC=1 -SHOW_SRV=1 -TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5" -TIMESTAMP_FILE="/var/ipfire/dns/dnssec-timestamp" - -# Pull custom configuration file -if [ -e "/etc/sysconfig/dnsmasq" ]; then - . /etc/sysconfig/dnsmasq -fi - -function dnssec_args() { - local cmdline="--dnssec --dnssec-timestamp ${TIMESTAMP_FILE}" - - if [ -n "${TRUST_ANCHOR}" ]; then - cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}" - fi - - echo "${cmdline}" -} - -function dns_forward_args() { - local file="${1}" - - # Do nothing if file is empty. - [ -s "${file}" ] || return - - local cmdline - - local enabled zone server remark - while IFS="," read -r enabled zone server remark; do - # Line must be enabled. - [ "${enabled}" = "on" ] || continue - - cmdline="${cmdline} --server=/${zone}/${server}" - done < ${file} - - echo "${cmdline}" -} - -function dns_leases_args() { - eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) - - # If the DHCP server is enabled and DNS Update (RFC2136) is - # enabled, too, we won't overlay the internal domain with - # the dynamic/static leases. - - if ([ "${ENABLE_GREEN}" = "on" ] || [ "${ENABLE_BLUE}" = "on" ]) \ - && [ "${DNS_UPDATE_ENABLED}" = "on" ]; then - return - fi - - echo "-l /var/state/dhcp/dhcpd.leases" -} - -case "${1}" in - start) - # kill already running copy of dnsmasq... - killproc /usr/sbin/dnsmasq 2>&1 > /dev/null - - boot_mesg "Starting Domain Name Service Proxy..." - - eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - ARGS="$CUSTOM_ARGS" - [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN" - - # DHCP configuration - ARGS="${ARGS} $(dns_leases_args)" - - echo > /var/ipfire/red/resolv.conf # Clear it - if [ -e "/var/ipfire/red/dns1" ]; then - DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null) - if [ ! -z ${DNS1} ]; then - echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf - fi - fi - if [ -e "/var/ipfire/red/dns2" ]; then - DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null) - if [ ! -z ${DNS2} ]; then - echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf - fi - fi - [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf" - - ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`" - - # Add custom forward dns zones. - ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)" - - # Enabled DNSSEC validation - if [ "${ENABLE_DNSSEC}" -eq 1 ]; then - ARGS="${ARGS} $(dnssec_args)" - fi - - if [ -n "${CACHE_SIZE}" ]; then - ARGS="${ARGS} --cache-size=${CACHE_SIZE}" - fi - - loadproc /usr/sbin/dnsmasq ${ARGS} - - if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then - boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}" - boot_mesg_flush - fi - ;; - - stop) - boot_mesg "Stopping Domain Name Service Proxy..." - killproc /usr/sbin/dnsmasq - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/sbin/dnsmasq - ;; - - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/dnsmasq diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 9182e98..b29ca2c 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -16,10 +16,6 @@ . ${rc_functions} eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) -init_networking() { - /etc/rc.d/init.d/dnsmasq start -} - DO="${1}" shift @@ -46,8 +42,6 @@ done case "${DO}" in start) - [ "${ALL}" == "1" ] && init_networking - # Starting interfaces... # GREEN [ "$green" == "1" ] && /etc/rc.d/init.d/networking/green start @@ -92,9 +86,6 @@ case "${DO}" in fi fi - # Stopping dnsmasq if network all networks shutdown - [ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop - exit 0 ;; diff --git a/src/initscripts/init.d/networking/red.down/05-update-dns-forwarders b/src/initscripts/init.d/networking/red.down/05-update-dns-forwarders new file mode 100644 index 0000000..7f35696 --- /dev/null +++ b/src/initscripts/init.d/networking/red.down/05-update-dns-forwarders @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update DNS forwarders for unbound +exec /etc/init.d/unbound update-forwarders diff --git a/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders b/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders new file mode 100644 index 0000000..7f35696 --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update DNS forwarders for unbound +exec /etc/init.d/unbound update-forwarders diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound new file mode 100644 index 0000000..f3d35cf --- /dev/null +++ b/src/initscripts/init.d/unbound @@ -0,0 +1,226 @@ +#!/bin/sh +# Begin $rc_base/init.d/unbound + +# Description : Unbound DNS resolver boot script for IPfire +# Author : Marcel Lorenz <marcel.lorenz(a)ipfire.org> +# +# Comment : This init script additional starts the dhcpd watcher daemon +# if DNS-Update (RFC2136) in web interface enabled + +. /etc/sysconfig/rc +. ${rc_functions} + +USE_FORWARDERS=1 + +# Load optional configuration +[ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound + +function cidr() { + local cidr nbits IFS; + IFS=. read -r i1 i2 i3 i4 <<< ${1} + IFS=. read -r m1 m2 m3 m4 <<< ${2} + cidr=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))") + nbits=0 + IFS=. + for dec in $2 ; do + case $dec in + 255) let nbits+=8;; + 254) let nbits+=7;; + 252) let nbits+=6;; + 248) let nbits+=5;; + 240) let nbits+=4;; + 224) let nbits+=3;; + 192) let nbits+=2;; + 128) let nbits+=1;; + 0);; + *) echo "Error: $dec is not recognised"; exit 1 + esac + done + echo "${cidr}/${nbits}" +} + +read_name_servers() { + local i + for i in 1 2; do + echo "$(</var/ipfire/red/dns${i})" + done | xargs echo +} + +config_header() { + echo "# This file is automatically generated and any changes" + echo "# will be overwritten. DO NOT EDIT!" + echo +} + +update_forwarders() { + local forwarders="$(read_name_servers)" + + if [ "${USE_FORWARDERS}" = "1" ] && [ -n "${forwarders}" ]; then + boot_mesg "Using Name Server(s): ${forwarders}" + boot_mesg_flush + + unbound-control -q forward ${forwarders} + + # If forwarders cannot be used we run in recursor mode + else + unbound-control -q forward off + fi +} + +write_interfaces_conf() { + ( + config_header + + if [ -n "${GREEN_ADDRESS}" ]; then + echo "# GREEN" + echo "interface: ${GREEN_ADDRESS}" + echo "access-control: $(cidr ${GREEN_NETADDRESS} ${GREEN_NETMASK}) allow" + fi + + if [ -n "${BLUE_ADDRESS}" ]; then + echo "# BLUE" + echo "interface: ${BLUE_ADDRESS}" + echo "access-control: $(cidr ${BLUE_NETADDRESS} ${BLUE_NETMASK}) allow" + fi + ) > /etc/unbound/interfaces.conf +} + +write_forward_conf() { + ( + config_header + + local enabled zone server remark + while IFS="," read -r enabled zone server remark; do + # Line must be enabled. + [ "${enabled}" = "on" ] || continue + + echo "forward-zone:" + echo " name: ${zone}" + echo " forward-addr: ${server}" + echo + done < /var/ipfire/dnsforward/config + ) > /etc/unbound/forward.conf +} + +write_tuning_conf() { + # https://www.unbound.net/documentation/howto_optimise.html + + # Determine number of online processors + local processors=$(getconf _NPROCESSORS_ONLN) + + # Determine number of slabs + local slabs=1 + while [ ${slabs} -lt ${processors} ]; do + slabs=$(( ${slabs} * 2 )) + done + + # Determine amount of system memory + local mem=$(get_memory_amount) + + # In the worst case scenario, unbound can use double the + # amount of memory allocated to a cache due to malloc overhead + + # Large systems with more than 2GB of RAM + if [ ${mem} -ge 2048 ]; then + mem=128 + + # Small systems with less than 256MB of RAM + elif [ ${mem} -le 256 ]; then + mem=8 + + # Everything else + else + mem=32 + fi + + ( + config_header + + # We run one thread per processor + echo "num-threads: ${processors}" + + # Adjust number of slabs + echo "infra-cache-slabs: ${slabs}" + echo "key-cache-slabs: ${slabs}" + echo "msg-cache-slabs: ${slabs}" + echo "rrset-cache-slabs: ${slabs}" + + # Slice up the cache + echo "rrset-cache-size: $(( ${mem} / 2 ))m" + echo "msg-cache-size: $(( ${mem} / 4 ))m" + echo "key-cache-size: $(( ${mem} / 4 ))m" + ) > /etc/unbound/tuning.conf +} + +get_memory_amount() { + local key val unit + + while read -r key val unit; do + case "${key}" in + MemTotal:*) + # Convert to MB + echo "$(( ${val} / 1024 ))" + break + ;; + esac + done < /proc/meminfo +} + +case "$1" in + start) + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) + + # Create control keys at first run + if [ ! -r "/etc/unbound/unbound_control.key" ]; then + unbound-control-setup -d /etc/unbound &>/dev/null + fi + + # Update configuration files + write_tuning_conf + write_interfaces_conf + write_forward_conf + + boot_mesg "Starting Unbound DNS Proxy..." + loadproc /usr/sbin/unbound || exit $? + + # Update any known forwarding name servers + update_forwarders + + # Start Unbound DHCP Lease Bridge unless RFC2136 is used + if [ "${DNS_UPDATE_ENABLED}" != on ]; then + boot_mesg "Starting Unbound DHCP Leases Bridge..." + loadproc /usr/sbin/unbound-dhcp-leases-bridge -d + fi + ;; + + stop) + boot_mesg "Stopping Unbound DHCP Leases Bridge..." + killproc /usr/sbin/unbound-dhcp-leases-bridge + + boot_mesg "Stopping Unbound DNS Proxy..." + killproc /usr/sbin/unbound + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/unbound + statusproc /usr/sbin/unbound-dhcp-leases-bridge + ;; + + update-forwarders) + update_forwarders + ;; + + *) + echo "Usage: $0 {start|stop|restart|status|update-forwarders}" + exit 1 + ;; +esac + +# End $rc_base/init.d/unbound diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index ff775da..08a4e37 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -31,7 +31,7 @@ SUID_PROGS = squidctrl sshctrl ipfirereboot \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ - getconntracktable wirelessclient dnsmasqctrl torctrl ddnsctrl + getconntracktable wirelessclient torctrl ddnsctrl unboundctrl SUID_UPDX = updxsetperms OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS)) diff --git a/src/misc-progs/dnsmasqctrl.c b/src/misc-progs/dnsmasqctrl.c deleted file mode 100644 index 8ac3360..0000000 --- a/src/misc-progs/dnsmasqctrl.c +++ /dev/null @@ -1,34 +0,0 @@ -/* This file is part of the IPFire Firewall. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <fcntl.h> -#include "setuid.h" - -int main(int argc, char *argv[]) { - - if (!(initsetuid())) - exit(1); - - if (argc < 2) { - fprintf(stderr, "\nNo argument given.\n\ndnsmasqctrl (restart)\n\n"); - exit(1); - } - - if (strcmp(argv[1], "restart") == 0) { - safe_system("/etc/rc.d/init.d/dnsmasq restart"); - } else { - fprintf(stderr, "\nBad argument given.\n\ndnsmasqctrl (restart)\n\n"); - exit(1); - } - - return 0; -} diff --git a/src/misc-progs/unboundctrl.c b/src/misc-progs/unboundctrl.c new file mode 100644 index 0000000..fea81c6 --- /dev/null +++ b/src/misc-progs/unboundctrl.c @@ -0,0 +1,34 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <fcntl.h> +#include "setuid.h" + +int main(int argc, char *argv[]) { + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\nunboundctrl (restart)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "restart") == 0) { + safe_system("/etc/rc.d/init.d/unbound restart"); + } else { + fprintf(stderr, "\nBad argument given.\n\nunboundctrl (restart)\n\n"); + exit(1); + } + + return 0; +} diff --git a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch deleted file mode 100644 index 97b7749..0000000 --- a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch +++ /dev/null @@ -1,363 +0,0 @@ ---- a/src/cache.c Wed Dec 16 19:24:12 2015 -+++ b/src/cache.c Wed Dec 16 19:37:37 2015 -@@ -17,7 +17,7 @@ - #include "dnsmasq.h" - - static struct crec *cache_head = NULL, *cache_tail = NULL, **hash_table = NULL; --#ifdef HAVE_DHCP -+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER) - static struct crec *dhcp_spare = NULL; - #endif - static struct crec *new_chain = NULL; -@@ -217,6 +217,9 @@ - crecp->flags &= ~F_BIGNAME; - } - -+ if (crecp->flags & F_DHCP) -+ free(crecp->name.namep); -+ - #ifdef HAVE_DNSSEC - cache_blockdata_free(crecp); - #endif -@@ -1138,7 +1141,7 @@ - - } - --#ifdef HAVE_DHCP -+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER) - struct in_addr a_record_from_hosts(char *name, time_t now) - { - struct crec *crecp = NULL; -@@ -1281,7 +1284,11 @@ - else - crec->ttd = ttd; - crec->addr.addr = *host_address; -+#ifdef HAVE_ISC_READER -+ crec->name.namep = strdup(host_name); -+#else - crec->name.namep = host_name; -+#endif - crec->uid = next_uid(); - cache_hash(crec); - ---- a/src/dnsmasq.c Thu Jul 30 20:59:06 2015 -+++ b/src/dnsmasq.c Wed Dec 16 19:38:32 2015 -@@ -1017,6 +1017,11 @@ - - poll_resolv(0, daemon->last_resolv != 0, now); - daemon->last_resolv = now; -+ -+#ifdef HAVE_ISC_READER -+ if (daemon->lease_file && !daemon->dhcp) -+ load_dhcp(now); -+#endif - } - #endif - ---- a/src/dnsmasq.h Wed Dec 16 19:24:12 2015 -+++ b/src/dnsmasq.h Wed Dec 16 19:40:11 2015 -@@ -1516,6 +1516,11 @@ - void poll_listen(int fd, short event); - int do_poll(int timeout); - -+/* isc.c */ -+#ifdef HAVE_ISC_READER -+void load_dhcp(time_t now); -+#endif -+ - /* rrfilter.c */ - size_t rrfilter(struct dns_header *header, size_t plen, int mode); - u16 *rrfilter_desc(int type); - int expand_workspace(unsigned char ***wkspc, int *szp, int new); -- ---- /dev/null Wed Dec 16 19:48:08 2015 -+++ b/src/isc.c Wed Dec 16 19:41:35 2015 -@@ -0,0 +1,266 @@ -+/* dnsmasq is Copyright (c) 2014 John Volpe, Simon Kelley and -+ Michael Tremer -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; version 2 dated June, 1991, or -+ (at your option) version 3 dated 29 June, 2007. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. -+ -+ Code in this file is based on contributions by John Volpe and -+ Simon Kelley. Updated for recent versions of dnsmasq by -+ Michael Tremer. -+*/ -+ -+ -+#define _GNU_SOURCE -+ -+#include <assert.h> -+#include <stdio.h> -+ -+#include "dnsmasq.h" -+ -+#ifdef HAVE_ISC_READER -+#define MAXTOK 50 -+ -+struct isc_dhcp_lease { -+ char* name; -+ char* fqdn; -+ time_t expires; -+ struct in_addr addr; -+ struct isc_dhcp_lease* next; -+}; -+ -+static struct isc_dhcp_lease* dhcp_lease_new(const char* hostname) { -+ struct isc_dhcp_lease* lease = whine_malloc(sizeof(*lease)); -+ if (!lease) -+ return NULL; -+ -+ lease->name = strdup(hostname); -+ if (daemon->domain_suffix) { -+ int r = asprintf(&lease->fqdn, "%s.%s", hostname, daemon->domain_suffix); -+ -+ // Handle OOM -+ if (r < 0) { -+ free(lease); -+ return NULL; -+ } -+ } -+ lease->expires = 0; -+ lease->next = NULL; -+ -+ return lease; -+} -+ -+static void dhcp_lease_free(struct isc_dhcp_lease* lease) { -+ if (!lease) -+ return; -+ -+ if (lease->name) -+ free(lease->name); -+ if (lease->fqdn) -+ free(lease->fqdn); -+ free(lease); -+} -+ -+static int next_token(char* token, int buffsize, FILE* fp) { -+ int c, count = 0; -+ char* cp = token; -+ -+ while ((c = getc(fp)) != EOF) { -+ if (c == '#') { -+ do { -+ c = getc(fp); -+ } while (c != '\n' && c != EOF); -+ } -+ -+ if (c == ' ' || c == '\t' || c == '\n' || c == ';') { -+ if (count) -+ break; -+ } else if ((c != '"') && (count < buffsize - 1)) { -+ *cp++ = c; -+ count++; -+ } -+ } -+ -+ *cp = 0; -+ return count ? 1 : 0; -+} -+ -+static long get_utc_offset() { -+ time_t t = time(NULL); -+ struct tm* time_struct = localtime(&t); -+ -+ return time_struct->tm_gmtoff; -+} -+ -+static time_t parse_lease_time(const char* token_date, const char* token_time) { -+ time_t time = (time_t)(-1); -+ struct tm lease_time; -+ -+ if (sscanf(token_date, "%d/%d/%d", &lease_time.tm_year, &lease_time.tm_mon, &lease_time.tm_mday) == 3) { -+ lease_time.tm_year -= 1900; -+ lease_time.tm_mon -= 1; -+ -+ if (sscanf(token_time, "%d:%d:%d", &lease_time.tm_hour, &lease_time.tm_min, &lease_time.tm_sec) == 3) { -+ time = mktime(&lease_time) + get_utc_offset(); -+ } -+ } -+ -+ return time; -+} -+ -+static struct isc_dhcp_lease* find_lease(const char* hostname, struct isc_dhcp_lease* leases) { -+ struct isc_dhcp_lease* lease = leases; -+ -+ while (lease) { -+ if (strcmp(hostname, lease->name) == 0) { -+ return lease; -+ } -+ lease = lease->next; -+ } -+ -+ return NULL; -+} -+ -+static off_t lease_file_size = (off_t)0; -+static ino_t lease_file_inode = (ino_t)0; -+ -+void load_dhcp(time_t now) { -+ struct isc_dhcp_lease* leases = NULL; -+ -+ struct stat statbuf; -+ if (stat(daemon->lease_file, &statbuf) == -1) { -+ return; -+ } -+ -+ /* Do nothing if the lease file has not changed. */ -+ if ((statbuf.st_size <= lease_file_size) && (statbuf.st_ino == lease_file_inode)) -+ return; -+ -+ lease_file_size = statbuf.st_size; -+ lease_file_inode = statbuf.st_ino; -+ -+ FILE* fp = fopen(daemon->lease_file, "r"); -+ if (!fp) { -+ my_syslog(LOG_ERR, _("failed to load %s:%s"), daemon->lease_file, strerror(errno)); -+ return; -+ } -+ -+ my_syslog(LOG_INFO, _("reading %s"), daemon->lease_file); -+ -+ char* hostname = daemon->namebuff; -+ struct in_addr host_address; -+ time_t time_starts = -1; -+ time_t time_ends = -1; -+ int nomem; -+ -+ char token[MAXTOK]; -+ while ((next_token(token, MAXTOK, fp))) { -+ if (strcmp(token, "lease") == 0) { -+ hostname[0] = '\0'; -+ -+ if (next_token(token, MAXTOK, fp) && ((host_address.s_addr = inet_addr(token)) != (in_addr_t)-1)) { -+ if (next_token(token, MAXTOK, fp) && *token == '{') { -+ while (next_token(token, MAXTOK, fp) && *token != '}') { -+ if ((strcmp(token, "client-hostname") == 0) || (strcmp(token, "hostname") == 0)) { -+ if (next_token(hostname, MAXDNAME, fp)) { -+ if (!canonicalise(hostname, &nomem)) { -+ *hostname = 0; -+ my_syslog(LOG_ERR, _("bad name in %s"), daemon->lease_file); -+ } -+ } -+ } else if ((strcmp(token, "starts") == 0) || (strcmp(token, "ends") == 0)) { -+ char token_date[MAXTOK]; -+ char token_time[MAXTOK]; -+ -+ int is_starts = strcmp(token, "starts") == 0; -+ -+ // Throw away the weekday and parse the date. -+ if (next_token(token, MAXTOK, fp) && next_token(token_date, MAXTOK, fp) && next_token(token_time, MAXTOK, fp)) { -+ time_t time = parse_lease_time(token_date, token_time); -+ -+ if (is_starts) -+ time_starts = time; -+ else -+ time_ends = time; -+ } -+ } -+ } -+ -+ if (!*hostname) -+ continue; -+ -+ if ((time_starts == -1) || (time_ends == -1)) -+ continue; -+ -+ if (difftime(now, time_ends) > 0) -+ continue; -+ -+ char* dot = strchr(hostname, '.'); -+ if (dot) { -+ if (!daemon->domain_suffix || hostname_isequal(dot + 1, daemon->domain_suffix)) { -+ my_syslog(LOG_WARNING, -+ _("Ignoring DHCP lease for %s because it has an illegal domain part"), -+ hostname); -+ continue; -+ } -+ *dot = 0; -+ } -+ -+ // Search for an existing lease in the list -+ // with the given host name and update the data -+ // if needed. -+ struct isc_dhcp_lease* lease = find_lease(hostname, leases); -+ -+ // If no lease already exists, we create a new one -+ // and append it to the list. -+ if (!lease) { -+ lease = dhcp_lease_new(hostname); -+ assert(lease); -+ -+ lease->next = leases; -+ leases = lease; -+ } -+ -+ // Only update more recent leases. -+ if (lease->expires > time_ends) -+ continue; -+ -+ lease->addr = host_address; -+ lease->expires = time_ends; -+ } -+ } -+ } -+ } -+ -+ fclose(fp); -+ -+ // Drop all entries. -+ cache_unhash_dhcp(); -+ -+ while (leases) { -+ struct isc_dhcp_lease *lease = leases; -+ leases = lease->next; -+ -+ if (lease->fqdn) { -+ cache_add_dhcp_entry(lease->fqdn, AF_INET, (struct all_addr*)&lease->addr.s_addr, lease->expires); -+ } -+ -+ if (lease->name) { -+ cache_add_dhcp_entry(lease->name, AF_INET, (struct all_addr*)&lease->addr.s_addr, lease->expires); -+ } -+ -+ // Cleanup -+ dhcp_lease_free(lease); -+ } -+} -+ -+#endif ---- a/src/option.c Wed Dec 16 19:24:12 2015 -+++ b/src/option.c Wed Dec 16 19:42:48 2015 -@@ -1771,7 +1771,7 @@ - ret_err(_("bad MX target")); - break; - --#ifdef HAVE_DHCP -+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER) - case 'l': /* --dhcp-leasefile */ - daemon->lease_file = opt_string_alloc(arg); - break; ---- a/Makefile Wed Dec 16 19:24:12 2015 -+++ b/Makefile Wed Dec 16 19:28:45 2015 -@@ -74,7 +74,7 @@ - helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \ - dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \ - domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \ -- poll.o rrfilter.o edns0.o arp.o -+ poll.o rrfilter.o edns0.o arp.o isc.o - - hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \ - dns-protocol.h radv-protocol.h ip6addr.h diff --git a/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch b/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch deleted file mode 100644 index 43ac068..0000000 --- a/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 294d36df4749e01199ab220d44c170e7db2b0c05 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 6 Jul 2016 21:30:25 +0100 -Subject: [PATCH] Calculate length of TFTP error reply correctly. - ---- - CHANGELOG | 14 ++++++++++++++ - src/tftp.c | 7 +++++-- - 2 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 04ff3f0..0559a6f 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,17 @@ -+version 2.77 -+ Calculate the length of TFTP error reply packet -+ correctly. This fixes a problem when the error -+ message in a TFTP packet exceeds the arbitrary -+ limit of 500 characters. The message was correctly -+ truncated, but not the packet length, so -+ extra data was appended. This is a possible -+ security risk, since the extra data comes from -+ a buffer which is also used for DNS, so that -+ previous DNS queries or replies may be leaked. -+ Thanks to Mozilla for funding the security audit -+ which spotted this bug. -+ -+ - version 2.76 - Include 0.0.0.0/8 in DNS rebind checks. This range - translates to hosts on the local network, or, at -diff --git a/src/tftp.c b/src/tftp.c -index 5e4a32a..3e1b5c5 100644 ---- a/src/tftp.c -+++ b/src/tftp.c -@@ -652,20 +652,23 @@ static void sanitise(char *buf) - - } - -+#define MAXMESSAGE 500 /* limit to make packet < 512 bytes and definitely smaller than buffer */ - static ssize_t tftp_err(int err, char *packet, char *message, char *file) - { - struct errmess { - unsigned short op, err; - char message[]; - } *mess = (struct errmess *)packet; -- ssize_t ret = 4; -+ ssize_t len, ret = 4; - char *errstr = strerror(errno); - - sanitise(file); - - mess->op = htons(OP_ERR); - mess->err = htons(err); -- ret += (snprintf(mess->message, 500, message, file, errstr) + 1); -+ len = snprintf(mess->message, MAXMESSAGE, message, file, errstr); -+ ret += (len < MAXMESSAGE) ? len + 1 : MAXMESSAGE; /* include terminating zero */ -+ - my_syslog(MS_TFTP | LOG_ERR, "%s", mess->message); - - return ret; --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch b/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch deleted file mode 100644 index b748db8..0000000 --- a/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d55f81f5fd53b1dfc2c4b3249b542f2d9679e236 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 6 Jul 2016 21:33:56 +0100 -Subject: [PATCH] Zero newly malloc'ed memory. - ---- - src/util.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/util.c b/src/util.c -index 93b24f5..82443c9 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -248,6 +248,8 @@ void *safe_malloc(size_t size) - - if (!ret) - die(_("could not get memory"), NULL, EC_NOMEM); -+ else -+ memset(ret, 0, size); - - return ret; - } -@@ -266,7 +268,9 @@ void *whine_malloc(size_t size) - - if (!ret) - my_syslog(LOG_ERR, _("failed to allocate %d bytes"), (int) size); -- -+ else -+ memset(ret, 0, size); -+ - return ret; - } - --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/003-Check_return_of_expand_always.patch b/src/patches/dnsmasq/003-Check_return_of_expand_always.patch deleted file mode 100644 index a69f4ce..0000000 --- a/src/patches/dnsmasq/003-Check_return_of_expand_always.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ce7845bf5429bd2962c9b2e7d75e2659f3b5c1a8 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 6 Jul 2016 21:42:27 +0100 -Subject: [PATCH] Check return of expand() always. - ---- - src/radv.c | 4 +++- - src/slaac.c | 5 ++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/radv.c b/src/radv.c -index 749b666..faa0f6d 100644 ---- a/src/radv.c -+++ b/src/radv.c -@@ -262,7 +262,9 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad - parm.prio = calc_prio(ra_param); - - save_counter(0); -- ra = expand(sizeof(struct ra_packet)); -+ -+ if (!(ra = expand(sizeof(struct ra_packet)))) -+ return; - - ra->type = ND_ROUTER_ADVERT; - ra->code = 0; -diff --git a/src/slaac.c b/src/slaac.c -index 8034805..07b8ba4 100644 ---- a/src/slaac.c -+++ b/src/slaac.c -@@ -147,7 +147,10 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) - struct sockaddr_in6 addr; - - save_counter(0); -- ping = expand(sizeof(struct ping_packet)); -+ -+ if (!(ping = expand(sizeof(struct ping_packet)))) -+ continue; -+ - ping->type = ICMP6_ECHO_REQUEST; - ping->code = 0; - ping->identifier = ping_id; --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch b/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch deleted file mode 100644 index f4d0d20..0000000 --- a/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5874f3e9222397d82aabd9884d9bf5ce7e4109b0 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Sun, 10 Jul 2016 22:12:08 +0100 -Subject: [PATCH] Fix editing error on man page. - -Thanks to Eric Westbrook for spotting this. ---- - man/dnsmasq.8 | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 0521534..bd8c0b3 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -1037,6 +1037,10 @@ is given, then read all the files contained in that directory. The advantage of - using this option is the same as for --dhcp-hostsfile: the - dhcp-optsfile will be re-read when dnsmasq receives SIGHUP. Note that - it is possible to encode the information in a -+.B --dhcp-boot -+flag as DHCP options, using the options names bootfile-name, -+server-ip-address and tftp-server. This allows these to be included -+in a dhcp-optsfile. - .TP - .B --dhcp-hostsdir=<path> - This is equivalent to dhcp-hostsfile, except for the following. The path MUST be a -@@ -1048,11 +1052,6 @@ is restarted; ie host records are only added dynamically. - .TP - .B --dhcp-optsdir=<path> - This is equivalent to dhcp-optsfile, with the differences noted for --dhcp-hostsdir. --.TP --.B --dhcp-boot --flag as DHCP options, using the options names bootfile-name, --server-ip-address and tftp-server. This allows these to be included --in a dhcp-optsfile. - .TP - .B \-Z, --read-ethers - Read /etc/ethers for information about hosts for the DHCP server. The --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/005-Manpage_typo.patch b/src/patches/dnsmasq/005-Manpage_typo.patch deleted file mode 100644 index 52f16de..0000000 --- a/src/patches/dnsmasq/005-Manpage_typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 907efeb2dc712603271093bce8a93c7c3e6fe64d Mon Sep 17 00:00:00 2001 -From: Kristjan Onu <jeixav(a)gmail.com> -Date: Sun, 10 Jul 2016 22:37:57 +0100 -Subject: [PATCH] Manpage typo. - ---- - man/dnsmasq.8 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index bd8c0b3..ac8d921 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -242,7 +242,7 @@ addresses associated with the interface. - .B --local-service - Accept DNS queries only from hosts whose address is on a local subnet, - ie a subnet for which an interface exists on the server. This option --only has effect is there are no --interface --except-interface, -+only has effect if there are no --interface --except-interface, - --listen-address or --auth-server options. It is intended to be set as - a default on installation, to allow unconfigured installations to be - useful but also safe from being used for DNS amplification attacks. --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch b/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch deleted file mode 100644 index ec17115..0000000 --- a/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 591ed1e90503817938ccf5f127e677a8dd48b6d8 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Mon, 11 Jul 2016 18:18:42 +0100 -Subject: [PATCH] Fix bad behaviour with some DHCP option arrangements. - -The check that there's enough space to store the DHCP agent-id -at the end of the packet could succeed when it should fail -if the END option is in either of the oprion-overload areas. -That could overwrite legit options in the request and cause -bad behaviour. It's highly unlikely that any sane DHCP client -would trigger this bug, and it's never been seen, but this -fixes the problem. - -Also fix off-by-one in bounds checking of option processing. -Worst case scenario on that is a read one byte beyond the -end off a buffer with a crafted packet, and maybe therefore -a SIGV crash if the memory after the buffer is not mapped. - -Thanks to Timothy Becker for spotting these. ---- - src/rfc2131.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/rfc2131.c b/src/rfc2131.c -index b7c167e..8b99d4b 100644 ---- a/src/rfc2131.c -+++ b/src/rfc2131.c -@@ -186,7 +186,8 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, - be enough free space at the end of the packet to copy the option. */ - unsigned char *sopt; - unsigned int total = option_len(opt) + 2; -- unsigned char *last_opt = option_find(mess, sz, OPTION_END, 0); -+ unsigned char *last_opt = option_find1(&mess->options[0] + sizeof(u32), ((unsigned char *)mess) + sz, -+ OPTION_END, 0); - if (last_opt && last_opt < end - total) - { - end -= total; -@@ -1606,7 +1607,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt - { - while (1) - { -- if (p > end) -+ if (p >= end) - return NULL; - else if (*p == OPTION_END) - return opt == OPTION_END ? p : NULL; --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch b/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch deleted file mode 100644 index 6a79eac..0000000 --- a/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1d07667ac77c55b9de56b1b2c385167e0e0ec27a Mon Sep 17 00:00:00 2001 -From: Ivan Kokshaysky <ink(a)jurassic.park.msu.ru> -Date: Mon, 11 Jul 2016 18:36:05 +0100 -Subject: [PATCH] Fix logic error in Linux netlink code. - -This could cause dnsmasq to enter a tight loop on systems -with a very large number of network interfaces. ---- - CHANGELOG | 6 ++++++ - src/netlink.c | 8 +++++++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 0559a6f..59c9c49 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -11,6 +11,12 @@ version 2.77 - Thanks to Mozilla for funding the security audit - which spotted this bug. - -+ Fix logic error in Linux netlink code. This could -+ cause dnsmasq to enter a tight loop on systems -+ with a very large number of network interfaces. -+ Thanks to Ivan Kokshaysky for the diagnosis and -+ patch. -+ - - version 2.76 - Include 0.0.0.0/8 in DNS rebind checks. This range -diff --git a/src/netlink.c b/src/netlink.c -index 049247b..8cd51af 100644 ---- a/src/netlink.c -+++ b/src/netlink.c -@@ -188,11 +188,17 @@ int iface_enumerate(int family, void *parm, int (*callback)()) - } - - for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len)) -- if (h->nlmsg_seq != seq || h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR) -+ if (h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR) - { - /* May be multicast arriving async */ - nl_async(h); - } -+ else if (h->nlmsg_seq != seq) -+ { -+ /* May be part of incomplete response to previous request after -+ ENOBUFS. Drop it. */ -+ continue; -+ } - else if (h->nlmsg_type == NLMSG_DONE) - return callback_ok; - else if (h->nlmsg_type == RTM_NEWADDR && family != AF_UNSPEC && family != AF_LOCAL) --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch b/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch deleted file mode 100644 index b32d17a..0000000 --- a/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 06093a9a845bb597005d892d5d1bc7859933ada4 Mon Sep 17 00:00:00 2001 -From: Kevin Darbyshire-Bryant <kevin(a)darbyshire-bryant.me.uk> -Date: Mon, 11 Jul 2016 21:03:27 +0100 -Subject: [PATCH] Fix problem with --dnssec-timestamp whereby receipt of - SIGHUP would erroneously engage timestamp checking. - ---- - CHANGELOG | 4 ++++ - src/dnsmasq.c | 7 ++++--- - src/dnsmasq.h | 1 + - src/dnssec.c | 5 +++-- - 4 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 59c9c49..9f1e404 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -17,6 +17,10 @@ version 2.77 - Thanks to Ivan Kokshaysky for the diagnosis and - patch. - -+ Fix problem with --dnssec-timestamp whereby receipt -+ of SIGHUP would erroneously engage timestamp checking. -+ Thanks to Kevin Darbyshire-Bryant for this work. -+ - - version 2.76 - Include 0.0.0.0/8 in DNS rebind checks. This range -diff --git a/src/dnsmasq.c b/src/dnsmasq.c -index 045ec53..a47273f 100644 ---- a/src/dnsmasq.c -+++ b/src/dnsmasq.c -@@ -750,7 +750,8 @@ int main (int argc, char **argv) - - my_syslog(LOG_INFO, _("DNSSEC validation enabled")); - -- if (option_bool(OPT_DNSSEC_TIME)) -+ daemon->dnssec_no_time_check = option_bool(OPT_DNSSEC_TIME); -+ if (option_bool(OPT_DNSSEC_TIME) && !daemon->back_to_the_future) - my_syslog(LOG_INFO, _("DNSSEC signature timestamps not checked until first cache reload")); - - if (rc == 1) -@@ -1226,10 +1227,10 @@ static void async_event(int pipe, time_t now) - { - case EVENT_RELOAD: - #ifdef HAVE_DNSSEC -- if (option_bool(OPT_DNSSEC_VALID) && option_bool(OPT_DNSSEC_TIME)) -+ if (daemon->dnssec_no_time_check && option_bool(OPT_DNSSEC_VALID) && option_bool(OPT_DNSSEC_TIME)) - { - my_syslog(LOG_INFO, _("now checking DNSSEC signature timestamps")); -- reset_option_bool(OPT_DNSSEC_TIME); -+ daemon->dnssec_no_time_check = 0; - } - #endif - /* fall through */ -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 1896a64..be27ae0 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -992,6 +992,7 @@ extern struct daemon { - #endif - #ifdef HAVE_DNSSEC - struct ds_config *ds; -+ int dnssec_no_time_check; - int back_to_the_future; - char *timestamp_file; - #endif -diff --git a/src/dnssec.c b/src/dnssec.c -index 3c77c7d..64358fa 100644 ---- a/src/dnssec.c -+++ b/src/dnssec.c -@@ -522,15 +522,16 @@ static int check_date_range(u32 date_start, u32 date_end) - if (utime(daemon->timestamp_file, NULL) != 0) - my_syslog(LOG_ERR, _("failed to update mtime on %s: %s"), daemon->timestamp_file, strerror(errno)); - -+ my_syslog(LOG_INFO, _("system time considered valid, now checking DNSSEC signature timestamps.")); - daemon->back_to_the_future = 1; -- set_option_bool(OPT_DNSSEC_TIME); -+ daemon->dnssec_no_time_check = 0; - queue_event(EVENT_RELOAD); /* purge cache */ - } - - if (daemon->back_to_the_future == 0) - return 1; - } -- else if (option_bool(OPT_DNSSEC_TIME)) -+ else if (daemon->dnssec_no_time_check) - return 1; - - /* We must explicitly check against wanted values, because of SERIAL_UNDEF */ --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch b/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch deleted file mode 100644 index 0300853..0000000 --- a/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d6dce53e08b3a06be16d43e1bf566c6c1988e4a9 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Mon, 11 Jul 2016 21:34:31 +0100 -Subject: [PATCH] malloc(); memset() -> calloc() for efficiency. - ---- - src/util.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/src/util.c b/src/util.c -index 82443c9..211690e 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -244,13 +244,11 @@ unsigned char *do_rfc1035_name(unsigned char *p, char *sval) - /* for use during startup */ - void *safe_malloc(size_t size) - { -- void *ret = malloc(size); -+ void *ret = calloc(1, size); - - if (!ret) - die(_("could not get memory"), NULL, EC_NOMEM); -- else -- memset(ret, 0, size); -- -+ - return ret; - } - -@@ -264,12 +262,10 @@ void safe_pipe(int *fd, int read_noblock) - - void *whine_malloc(size_t size) - { -- void *ret = malloc(size); -+ void *ret = calloc(1, size); - - if (!ret) - my_syslog(LOG_ERR, _("failed to allocate %d bytes"), (int) size); -- else -- memset(ret, 0, size); - - return ret; - } --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch b/src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch deleted file mode 100644 index a8c10a4..0000000 --- a/src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch +++ /dev/null @@ -1,169 +0,0 @@ -From fa78573778cb23337f67f5d0c9de723169919047 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Fri, 22 Jul 2016 20:56:01 +0100 -Subject: [PATCH] Zero packet buffers before building output, to reduce risk - of information leakage. - ---- - src/auth.c | 5 +++++ - src/dnsmasq.h | 1 + - src/outpacket.c | 10 ++++++++++ - src/radv.c | 2 +- - src/rfc1035.c | 5 +++++ - src/rfc3315.c | 6 +++--- - src/slaac.c | 2 +- - src/tftp.c | 5 ++++- - 8 files changed, 30 insertions(+), 6 deletions(-) - -diff --git a/src/auth.c b/src/auth.c -index 198572d..3c5c37f 100644 ---- a/src/auth.c -+++ b/src/auth.c -@@ -101,6 +101,11 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n - struct all_addr addr; - struct cname *a; - -+ /* Clear buffer beyond request to avoid risk of -+ information disclosure. */ -+ memset(((char *)header) + qlen, 0, -+ (limit - ((char *)header)) - qlen); -+ - if (ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY ) - return 0; - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index be27ae0..2bda5d0 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -1471,6 +1471,7 @@ void log_relay(int family, struct dhcp_relay *relay); - /* outpacket.c */ - #ifdef HAVE_DHCP6 - void end_opt6(int container); -+void reset_counter(void); - int save_counter(int newval); - void *expand(size_t headroom); - int new_opt6(int opt); -diff --git a/src/outpacket.c b/src/outpacket.c -index a414efa..2caacd9 100644 ---- a/src/outpacket.c -+++ b/src/outpacket.c -@@ -29,9 +29,19 @@ void end_opt6(int container) - PUTSHORT(len, p); - } - -+void reset_counter(void) -+{ -+ /* Clear out buffer when starting from begining */ -+ if (daemon->outpacket.iov_base) -+ memset(daemon->outpacket.iov_base, 0, daemon->outpacket.iov_len); -+ -+ save_counter(0); -+} -+ - int save_counter(int newval) - { - int ret = outpacket_counter; -+ - if (newval != -1) - outpacket_counter = newval; - -diff --git a/src/radv.c b/src/radv.c -index faa0f6d..39c9217 100644 ---- a/src/radv.c -+++ b/src/radv.c -@@ -261,7 +261,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad - parm.adv_interval = calc_interval(ra_param); - parm.prio = calc_prio(ra_param); - -- save_counter(0); -+ reset_counter(); - - if (!(ra = expand(sizeof(struct ra_packet)))) - return; -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 24d08c1..9e730a9 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1209,6 +1209,11 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, - int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1; - struct mx_srv_record *rec; - size_t len; -+ -+ /* Clear buffer beyond request to avoid risk of -+ information disclosure. */ -+ memset(((char *)header) + qlen, 0, -+ (limit - ((char *)header)) - qlen); - - if (ntohs(header->ancount) != 0 || - ntohs(header->nscount) != 0 || -diff --git a/src/rfc3315.c b/src/rfc3315.c -index 3f4d69c..e1271a1 100644 ---- a/src/rfc3315.c -+++ b/src/rfc3315.c -@@ -89,7 +89,7 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if - for (vendor = daemon->dhcp_vendors; vendor; vendor = vendor->next) - vendor->netid.next = &vendor->netid; - -- save_counter(0); -+ reset_counter(); - state.context = context; - state.interface = interface; - state.iface_name = iface_name; -@@ -2084,7 +2084,7 @@ void relay_upstream6(struct dhcp_relay *relay, ssize_t sz, - if (hopcount > 32) - return; - -- save_counter(0); -+ reset_counter(); - - if ((header = put_opt6(NULL, 34))) - { -@@ -2161,7 +2161,7 @@ unsigned short relay_reply6(struct sockaddr_in6 *peer, ssize_t sz, char *arrival - (!relay->interface || wildcard_match(relay->interface, arrival_interface))) - break; - -- save_counter(0); -+ reset_counter(); - - if (relay) - { -diff --git a/src/slaac.c b/src/slaac.c -index 07b8ba4..bd6c9b4 100644 ---- a/src/slaac.c -+++ b/src/slaac.c -@@ -146,7 +146,7 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) - struct ping_packet *ping; - struct sockaddr_in6 addr; - -- save_counter(0); -+ reset_counter(); - - if (!(ping = expand(sizeof(struct ping_packet)))) - continue; -diff --git a/src/tftp.c b/src/tftp.c -index 3e1b5c5..618c406 100644 ---- a/src/tftp.c -+++ b/src/tftp.c -@@ -662,8 +662,9 @@ static ssize_t tftp_err(int err, char *packet, char *message, char *file) - ssize_t len, ret = 4; - char *errstr = strerror(errno); - -+ memset(packet, 0, daemon->packet_buff_sz); - sanitise(file); -- -+ - mess->op = htons(OP_ERR); - mess->err = htons(err); - len = snprintf(mess->message, MAXMESSAGE, message, file, errstr); -@@ -684,6 +685,8 @@ static ssize_t tftp_err_oops(char *packet, char *file) - /* return -1 for error, zero for done. */ - static ssize_t get_block(char *packet, struct tftp_transfer *transfer) - { -+ memset(packet, 0, daemon->packet_buff_sz); -+ - if (transfer->block == 0) - { - /* send OACK */ --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch b/src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch deleted file mode 100644 index ab8ba28..0000000 --- a/src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6b1c464d6de3d7d2afc9b53afe78cda6d6e3316f Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Fri, 22 Jul 2016 20:59:16 +0100 -Subject: [PATCH] Don't reset packet length on transmission, in case of - retransmission. - ---- - src/radv.c | 2 +- - src/rfc3315.c | 2 +- - src/slaac.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/radv.c b/src/radv.c -index 39c9217..ffc37f2 100644 ---- a/src/radv.c -+++ b/src/radv.c -@@ -528,7 +528,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad - } - - while (retry_send(sendto(daemon->icmp6fd, daemon->outpacket.iov_base, -- save_counter(0), 0, (struct sockaddr *)&addr, -+ save_counter(-1), 0, (struct sockaddr *)&addr, - sizeof(addr)))); - - } -diff --git a/src/rfc3315.c b/src/rfc3315.c -index e1271a1..c7bf46f 100644 ---- a/src/rfc3315.c -+++ b/src/rfc3315.c -@@ -2127,7 +2127,7 @@ void relay_upstream6(struct dhcp_relay *relay, ssize_t sz, - my_syslog(MS_DHCP | LOG_ERR, _("Cannot multicast to DHCPv6 server without correct interface")); - } - -- send_from(daemon->dhcp6fd, 0, daemon->outpacket.iov_base, save_counter(0), &to, &from, 0); -+ send_from(daemon->dhcp6fd, 0, daemon->outpacket.iov_base, save_counter(-1), &to, &from, 0); - - if (option_bool(OPT_LOG_OPTS)) - { -diff --git a/src/slaac.c b/src/slaac.c -index bd6c9b4..7ecf127 100644 ---- a/src/slaac.c -+++ b/src/slaac.c -@@ -164,7 +164,7 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) - addr.sin6_port = htons(IPPROTO_ICMPV6); - addr.sin6_addr = slaac->addr; - -- if (sendto(daemon->icmp6fd, daemon->outpacket.iov_base, save_counter(0), 0, -+ if (sendto(daemon->icmp6fd, daemon->outpacket.iov_base, save_counter(-1), 0, - (struct sockaddr *)&addr, sizeof(addr)) == -1 && - errno == EHOSTUNREACH) - slaac->ping_time = 0; /* Give up */ --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch b/src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch deleted file mode 100644 index c71f470..0000000 --- a/src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bf4e62c19e619f7edf8d03d58d33a5752f190bfd Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Fri, 22 Jul 2016 21:37:59 +0100 -Subject: [PATCH] Compile-time check on buffer sizes for leasefile parsing - code. - ---- - src/dhcp-common.c | 16 ++++++++-------- - src/dhcp-protocol.h | 4 ++++ - src/lease.c | 9 ++++++++- - src/rfc3315.c | 2 +- - 4 files changed, 21 insertions(+), 10 deletions(-) - -diff --git a/src/dhcp-common.c b/src/dhcp-common.c -index 08528e8..ecc752b 100644 ---- a/src/dhcp-common.c -+++ b/src/dhcp-common.c -@@ -20,11 +20,11 @@ - - void dhcp_common_init(void) - { -- /* These each hold a DHCP option max size 255 -- and get a terminating zero added */ -- daemon->dhcp_buff = safe_malloc(256); -- daemon->dhcp_buff2 = safe_malloc(256); -- daemon->dhcp_buff3 = safe_malloc(256); -+ /* These each hold a DHCP option max size 255 -+ and get a terminating zero added */ -+ daemon->dhcp_buff = safe_malloc(DHCP_BUFF_SZ); -+ daemon->dhcp_buff2 = safe_malloc(DHCP_BUFF_SZ); -+ daemon->dhcp_buff3 = safe_malloc(DHCP_BUFF_SZ); - - /* dhcp_packet is used by v4 and v6, outpacket only by v6 - sizeof(struct dhcp_packet) is as good an initial size as any, -@@ -855,14 +855,14 @@ void log_context(int family, struct dhcp_context *context) - if (context->flags & CONTEXT_RA_STATELESS) - { - if (context->flags & CONTEXT_TEMPLATE) -- strncpy(daemon->dhcp_buff, context->template_interface, 256); -+ strncpy(daemon->dhcp_buff, context->template_interface, DHCP_BUFF_SZ); - else - strcpy(daemon->dhcp_buff, daemon->addrbuff); - } - else - #endif -- inet_ntop(family, start, daemon->dhcp_buff, 256); -- inet_ntop(family, end, daemon->dhcp_buff3, 256); -+ inet_ntop(family, start, daemon->dhcp_buff, DHCP_BUFF_SZ); -+ inet_ntop(family, end, daemon->dhcp_buff3, DHCP_BUFF_SZ); - my_syslog(MS_DHCP | LOG_INFO, - (context->flags & CONTEXT_RA_STATELESS) ? - _("%s stateless on %s%.0s%.0s%s") : -diff --git a/src/dhcp-protocol.h b/src/dhcp-protocol.h -index a31d829..0ea449b 100644 ---- a/src/dhcp-protocol.h -+++ b/src/dhcp-protocol.h -@@ -19,6 +19,10 @@ - #define DHCP_CLIENT_ALTPORT 1068 - #define PXE_PORT 4011 - -+/* These each hold a DHCP option max size 255 -+ and get a terminating zero added */ -+#define DHCP_BUFF_SZ 256 -+ - #define BOOTREQUEST 1 - #define BOOTREPLY 2 - #define DHCP_COOKIE 0x63825363 -diff --git a/src/lease.c b/src/lease.c -index 20cac90..ca62cc5 100644 ---- a/src/lease.c -+++ b/src/lease.c -@@ -65,7 +65,14 @@ void lease_init(time_t now) - } - - /* client-id max length is 255 which is 255*2 digits + 254 colons -- borrow DNS packet buffer which is always larger than 1000 bytes */ -+ borrow DNS packet buffer which is always larger than 1000 bytes -+ -+ Check various buffers are big enough for the code below */ -+ -+#if (DHCP_BUFF_SZ < 255) || (MAXDNAME < 64) || (PACKETSZ+MAXDNAME+RRFIXEDSZ < 764) -+# error Buffer size breakage in leasfile parsing. -+#endif -+ - if (leasestream) - while (fscanf(leasestream, "%255s %255s", daemon->dhcp_buff3, daemon->dhcp_buff2) == 2) - { -diff --git a/src/rfc3315.c b/src/rfc3315.c -index c7bf46f..568b0c8 100644 ---- a/src/rfc3315.c -+++ b/src/rfc3315.c -@@ -1975,7 +1975,7 @@ static void log6_packet(struct state *state, char *type, struct in6_addr *addr, - - if (addr) - { -- inet_ntop(AF_INET6, addr, daemon->dhcp_buff2, 255); -+ inet_ntop(AF_INET6, addr, daemon->dhcp_buff2, DHCP_BUFF_SZ - 1); - strcat(daemon->dhcp_buff2, " "); - } - else --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch b/src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch deleted file mode 100644 index bb5fe5d..0000000 --- a/src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 094bfaeb4ff69cae99387bc2ea07ff57632c89f5 Mon Sep 17 00:00:00 2001 -From: Mathias Kresin <dev(a)kresin.me> -Date: Sun, 24 Jul 2016 14:15:22 +0100 -Subject: [PATCH] auth-zone: allow to exclude ip addresses from answer. - ---- - man/dnsmasq.8 | 6 +++++- - src/auth.c | 61 ++++++++++++++++++++++++++++++++++++--------------------- - src/dnsmasq.h | 1 + - src/option.c | 21 ++++++++++++++++++-- - 4 files changed, 64 insertions(+), 25 deletions(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index ac8d921..8910947 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -739,7 +739,7 @@ a return code of SERVFAIL. Note that - setting this may affect DNS behaviour in bad ways, it is not an - extra-logging flag and should not be set in production. - .TP --.B --auth-zone=<domain>[,<subnet>[/<prefix length>][,<subnet>[/<prefix length>].....]] -+.B --auth-zone=<domain>[,<subnet>[/<prefix length>][,<subnet>[/<prefix length>].....][,exclude:<subnet>[/<prefix length>]].....] - Define a DNS zone for which dnsmasq acts as authoritative server. Locally defined DNS records which are in the domain - will be served. If subnet(s) are given, A and AAAA records must be in one of the - specified subnets. -@@ -756,6 +756,10 @@ appear in the zone, but RFC1918 IPv4 addresses which should not. - Interface-name and address-literal subnet specifications may be used - freely in the same --auth-zone declaration. - -+It's possible to exclude certain IP addresses from responses. It can be -+used, to make sure that answers contain only global routeable IP -+addresses (by excluding loopback, RFC1918 and ULA addresses). -+ - The subnet(s) are also used to define in-addr.arpa and - ip6.arpa domains which are served for reverse-DNS queries. If not - specified, the prefix length defaults to 24 for IPv4 and 64 for IPv6. -diff --git a/src/auth.c b/src/auth.c -index 3c5c37f..f1ca2f5 100644 ---- a/src/auth.c -+++ b/src/auth.c -@@ -18,36 +18,53 @@ - - #ifdef HAVE_AUTH - --static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all_addr *addr_u) -+static struct addrlist *find_addrlist(struct addrlist *list, int flag, struct all_addr *addr_u) - { -- struct addrlist *subnet; -- -- for (subnet = zone->subnet; subnet; subnet = subnet->next) -- { -- if (!(subnet->flags & ADDRLIST_IPV6)) -- { -- struct in_addr netmask, addr = addr_u->addr.addr4; -- -- if (!(flag & F_IPV4)) -- continue; -- -- netmask.s_addr = htonl(~(in_addr_t)0 << (32 - subnet->prefixlen)); -- -- if (is_same_net(addr, subnet->addr.addr.addr4, netmask)) -- return subnet; -- } -+ do { -+ if (!(list->flags & ADDRLIST_IPV6)) -+ { -+ struct in_addr netmask, addr = addr_u->addr.addr4; -+ -+ if (!(flag & F_IPV4)) -+ continue; -+ -+ netmask.s_addr = htonl(~(in_addr_t)0 << (32 - list->prefixlen)); -+ -+ if (is_same_net(addr, list->addr.addr.addr4, netmask)) -+ return list; -+ } - #ifdef HAVE_IPV6 -- else if (is_same_net6(&(addr_u->addr.addr6), &subnet->addr.addr.addr6, subnet->prefixlen)) -- return subnet; -+ else if (is_same_net6(&(addr_u->addr.addr6), &list->addr.addr.addr6, list->prefixlen)) -+ return list; - #endif -- -- } -+ -+ } while ((list = list->next)); -+ - return NULL; - } - -+static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all_addr *addr_u) -+{ -+ if (!zone->subnet) -+ return NULL; -+ -+ return find_addrlist(zone->subnet, flag, addr_u); -+} -+ -+static struct addrlist *find_exclude(struct auth_zone *zone, int flag, struct all_addr *addr_u) -+{ -+ if (!zone->exclude) -+ return NULL; -+ -+ return find_addrlist(zone->exclude, flag, addr_u); -+} -+ - static int filter_zone(struct auth_zone *zone, int flag, struct all_addr *addr_u) - { -- /* No zones specified, no filter */ -+ if (find_exclude(zone, flag, addr_u)) -+ return 0; -+ -+ /* No subnets specified, no filter */ - if (!zone->subnet) - return 1; - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 2bda5d0..27385a9 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -340,6 +340,7 @@ struct auth_zone { - struct auth_name_list *next; - } *interface_names; - struct addrlist *subnet; -+ struct addrlist *exclude; - struct auth_zone *next; - }; - -diff --git a/src/option.c b/src/option.c -index d8c57d6..6cedef3 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -1906,6 +1906,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - new = opt_malloc(sizeof(struct auth_zone)); - new->domain = opt_string_alloc(arg); - new->subnet = NULL; -+ new->exclude = NULL; - new->interface_names = NULL; - new->next = daemon->auth_zones; - daemon->auth_zones = new; -@@ -1913,6 +1914,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - while ((arg = comma)) - { - int prefixlen = 0; -+ int is_exclude = 0; - char *prefix; - struct addrlist *subnet = NULL; - struct all_addr addr; -@@ -1923,6 +1925,12 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - if (prefix && !atoi_check(prefix, &prefixlen)) - ret_err(gen_err); - -+ if (strstr(arg, "exclude:") == arg) -+ { -+ is_exclude = 1; -+ arg = arg+8; -+ } -+ - if (inet_pton(AF_INET, arg, &addr.addr.addr4)) - { - subnet = opt_malloc(sizeof(struct addrlist)); -@@ -1960,8 +1968,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - if (subnet) - { - subnet->addr = addr; -- subnet->next = new->subnet; -- new->subnet = subnet; -+ -+ if (is_exclude) -+ { -+ subnet->next = new->exclude; -+ new->exclude = subnet; -+ } -+ else -+ { -+ subnet->next = new->subnet; -+ new->subnet = subnet; -+ } - } - } - break; --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch b/src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch deleted file mode 100644 index 054323b..0000000 --- a/src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c8328ecde896575b3cb81cf537747df531f90771 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Fri, 5 Aug 2016 16:54:58 +0100 -Subject: [PATCH] Bump auth zone serial when reloading /etc/hosts and friends. - ---- - CHANGELOG | 4 ++++ - src/dnsmasq.c | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/CHANGELOG b/CHANGELOG -index 9f1e404..4f89799 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -20,6 +20,10 @@ version 2.77 - Fix problem with --dnssec-timestamp whereby receipt - of SIGHUP would erroneously engage timestamp checking. - Thanks to Kevin Darbyshire-Bryant for this work. -+ -+ Bump zone serial on reloading /etc/hosts and friends -+ when providing authoritative DNS. Thanks to Harrald -+ Dunkel for spotting this. - - - version 2.76 -diff --git a/src/dnsmasq.c b/src/dnsmasq.c -index a47273f..3580bea 100644 ---- a/src/dnsmasq.c -+++ b/src/dnsmasq.c -@@ -1226,6 +1226,8 @@ static void async_event(int pipe, time_t now) - switch (ev.event) - { - case EVENT_RELOAD: -+ daemon->soa_sn++; /* Bump zone serial, as it may have changed. */ -+ - #ifdef HAVE_DNSSEC - if (daemon->dnssec_no_time_check && option_bool(OPT_DNSSEC_VALID) && option_bool(OPT_DNSSEC_TIME)) - { --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch b/src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch deleted file mode 100644 index 7ebef83..0000000 --- a/src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6d95099c56a926d672e0407d6017fef9714f40c4 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Thu, 11 Aug 2016 23:38:54 +0100 -Subject: [PATCH] Handle v4-mapped IPv6 addresses sanely for --synth-domain. - ---- - CHANGELOG | 7 ++++++- - man/dnsmasq.8 | 2 ++ - src/domain.c | 34 ++++++++++++++++++++++++---------- - 3 files changed, 32 insertions(+), 11 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 4f89799..2731cc4 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -24,7 +24,12 @@ version 2.77 - Bump zone serial on reloading /etc/hosts and friends - when providing authoritative DNS. Thanks to Harrald - Dunkel for spotting this. -- -+ -+ Handle v4-mapped IPv6 addresses sanely in --synth-domain. -+ These have standard representation like ::ffff:1.2.3.4 -+ and are now converted to names like -+ <prefix>--ffff-1-2-3-4.<domain> -+ - - version 2.76 - Include 0.0.0.0/8 in DNS rebind checks. This range -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 8910947..91fe672 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -619,6 +619,8 @@ but IPv6 addresses may start with '::' - but DNS labels may not start with '-' so in this case if no prefix is - configured a zero is added in front of the label. ::1 becomes 0--1. - -+V4 mapped IPv6 addresses, which have a representation like ::ffff:1.2.3.4 are handled specially, and become like 0--ffff-1-2-3-4 -+ - The address range can be of the form - <ip address>,<ip address> or <ip address>/<netmask> - .TP -diff --git a/src/domain.c b/src/domain.c -index 1dd5027..a007acd 100644 ---- a/src/domain.c -+++ b/src/domain.c -@@ -77,18 +77,31 @@ int is_name_synthetic(int flags, char *name, struct all_addr *addr) - - *p = 0; - -- /* swap . or : for - */ -- for (p = tail; *p; p++) -- if (*p == '-') -- { -- if (prot == AF_INET) -+ #ifdef HAVE_IPV6 -+ if (prot == AF_INET6 && strstr(tail, "--ffff-") == tail) -+ { -+ /* special hack for v4-mapped. */ -+ memcpy(tail, "::ffff:", 7); -+ for (p = tail + 7; *p; p++) -+ if (*p == '-') - *p = '.'; -+ } -+ else -+#endif -+ { -+ /* swap . or : for - */ -+ for (p = tail; *p; p++) -+ if (*p == '-') -+ { -+ if (prot == AF_INET) -+ *p = '.'; - #ifdef HAVE_IPV6 -- else -- *p = ':'; -+ else -+ *p = ':'; - #endif -- } -- -+ } -+ } -+ - if (hostname_isequal(c->domain, p+1) && inet_pton(prot, tail, addr)) - { - if (prot == AF_INET) -@@ -169,8 +182,9 @@ int is_rev_synth(int flag, struct all_addr *addr, char *name) - inet_ntop(AF_INET6, &addr->addr.addr6, name+1, ADDRSTRLEN); - } - -+ /* V4-mapped have periods.... */ - for (p = name; *p; p++) -- if (*p == ':') -+ if (*p == ':' || *p == '.') - *p = '-'; - - strncat(name, ".", MAXDNAME); --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch b/src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch deleted file mode 100644 index db27f90..0000000 --- a/src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 396750cef533cf72c7e6a72e47a9c93e2e431cb7 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Sat, 13 Aug 2016 22:34:11 +0100 -Subject: [PATCH] Refactor openBSD pftables code to remove blatant copyright - violation. - ---- - src/tables.c | 90 +++++++++++++++++++++------------------------------------- - 1 file changed, 32 insertions(+), 58 deletions(-) - -diff --git a/src/tables.c b/src/tables.c -index aae1252..4fa3487 100644 ---- a/src/tables.c -+++ b/src/tables.c -@@ -53,52 +53,6 @@ static char *pfr_strerror(int errnum) - } - } - --static int pfr_add_tables(struct pfr_table *tbl, int size, int *nadd, int flags) --{ -- struct pfioc_table io; -- -- if (size < 0 || (size && tbl == NULL)) -- { -- errno = EINVAL; -- return (-1); -- } -- bzero(&io, sizeof io); -- io.pfrio_flags = flags; -- io.pfrio_buffer = tbl; -- io.pfrio_esize = sizeof(*tbl); -- io.pfrio_size = size; -- if (ioctl(dev, DIOCRADDTABLES, &io)) -- return (-1); -- if (nadd != NULL) -- *nadd = io.pfrio_nadd; -- return (0); --} -- --static int fill_addr(const struct all_addr *ipaddr, int flags, struct pfr_addr* addr) { -- if ( !addr || !ipaddr) -- { -- my_syslog(LOG_ERR, _("error: fill_addr missused")); -- return -1; -- } -- bzero(addr, sizeof(*addr)); --#ifdef HAVE_IPV6 -- if (flags & F_IPV6) -- { -- addr->pfra_af = AF_INET6; -- addr->pfra_net = 0x80; -- memcpy(&(addr->pfra_ip6addr), &(ipaddr->addr), sizeof(struct in6_addr)); -- } -- else --#endif -- { -- addr->pfra_af = AF_INET; -- addr->pfra_net = 0x20; -- addr->pfra_ip4addr.s_addr = ipaddr->addr.addr4.s_addr; -- } -- return 1; --} -- --/*****************************************************************************/ - - void ipset_init(void) - { -@@ -111,14 +65,13 @@ void ipset_init(void) - } - - int add_to_ipset(const char *setname, const struct all_addr *ipaddr, -- int flags, int remove) -+ int flags, int remove) - { - struct pfr_addr addr; - struct pfioc_table io; - struct pfr_table table; -- int n = 0, rc = 0; - -- if ( dev == -1 ) -+ if (dev == -1) - { - my_syslog(LOG_ERR, _("warning: no opened pf devices %s"), pf_device); - return -1; -@@ -126,31 +79,52 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr, - - bzero(&table, sizeof(struct pfr_table)); - table.pfrt_flags |= PFR_TFLAG_PERSIST; -- if ( strlen(setname) >= PF_TABLE_NAME_SIZE ) -+ if (strlen(setname) >= PF_TABLE_NAME_SIZE) - { - my_syslog(LOG_ERR, _("error: cannot use table name %s"), setname); - errno = ENAMETOOLONG; - return -1; - } - -- if ( strlcpy(table.pfrt_name, setname, -- sizeof(table.pfrt_name)) >= sizeof(table.pfrt_name)) -+ if (strlcpy(table.pfrt_name, setname, -+ sizeof(table.pfrt_name)) >= sizeof(table.pfrt_name)) - { - my_syslog(LOG_ERR, _("error: cannot strlcpy table name %s"), setname); - return -1; - } - -- if ((rc = pfr_add_tables(&table, 1, &n, 0))) -+ bzero(&io, sizeof io); -+ io.pfrio_flags = 0; -+ io.pfrio_buffer = &table; -+ io.pfrio_esize = sizeof(table); -+ io.pfrio_size = 1; -+ if (ioctl(dev, DIOCRADDTABLES, &io)) - { -- my_syslog(LOG_WARNING, _("warning: pfr_add_tables: %s(%d)"), -- pfr_strerror(errno),rc); -+ my_syslog(LOG_WARNING, _("IPset: error:%s"), pfr_strerror(errno)); -+ - return -1; - } -+ - table.pfrt_flags &= ~PFR_TFLAG_PERSIST; -- if (n) -+ if (io.pfrio_nadd) - my_syslog(LOG_INFO, _("info: table created")); -- -- fill_addr(ipaddr,flags,&addr); -+ -+ bzero(&addr, sizeof(addr)); -+#ifdef HAVE_IPV6 -+ if (flags & F_IPV6) -+ { -+ addr.pfra_af = AF_INET6; -+ addr.pfra_net = 0x80; -+ memcpy(&(addr.pfra_ip6addr), &(ipaddr->addr), sizeof(struct in6_addr)); -+ } -+ else -+#endif -+ { -+ addr.pfra_af = AF_INET; -+ addr.pfra_net = 0x20; -+ addr.pfra_ip4addr.s_addr = ipaddr->addr.addr4.s_addr; -+ } -+ - bzero(&io, sizeof(io)); - io.pfrio_flags = 0; - io.pfrio_table = table; --- -1.7.10.4 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3364c93e37c65ed8544066ed55afe1941b2b6f8d
by git＠ipfire.org 08 Sep '16

08 Sep '16

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 3364c93e37c65ed8544066ed55afe1941b2b6f8d (commit) from 3943a54036fcce71d57b1bbd2c2759c64c5f1f86 (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 3364c93e37c65ed8544066ed55afe1941b2b6f8d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Sep 8 08:36:58 2016 +0200 BUG11177: pppoe password not required anymore fixes: #11177 There are providers which do not use passwords anymore. For this reason the password field is no longer mandatory. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pppsetup.cgi | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) Difference in files: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 36d0ced..4b45ee5 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -103,10 +103,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if ($pppsettings{'USERNAME'} eq '') { $errormessage = $Lang::tr{'username not set'}; goto ERROR; } - if ($pppsettings{'PASSWORD'} eq '') { - $errormessage = $Lang::tr{'password not set'}; - goto ERROR; } - } + } if ($pppsettings{'TIMEOUT'} eq '') { $errormessage = $Lang::tr{'idle timeout not set'}; @@ -927,7 +924,7 @@ print <<END <tr> <td width='25%'>$Lang::tr{'username'} <img src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td> - <td width='25%'>$Lang::tr{'password'} <img src='/blob.gif' alt='*' /></td> + <td width='25%'>$Lang::tr{'password'} </td> <td width='25%'><input type='password' name='PASSWORD' value='$pppsettings{'PASSWORD'}' /></td> </tr> <tr> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5589c80fef41be6e151866cd319f020856938b58
by git＠ipfire.org 07 Sep '16

07 Sep '16

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 3.x development tree". The branch, master has been updated via 5589c80fef41be6e151866cd319f020856938b58 (commit) via e7f50e453989d29c218f6a24dfc02b668c1d19a0 (commit) from 47f1e602e25df9ded46e92c77ab8cd076cb42f01 (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 5589c80fef41be6e151866cd319f020856938b58 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 7 11:43:24 2016 +0100 lrmi: Drop package This was only needed for building the i686 kernel package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e7f50e453989d29c218f6a24dfc02b668c1d19a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 7 11:40:56 2016 +0100 kernel: Update to 4.4.19 Drop i686 kernel configuration because we won't support x86 32bit any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/config-arm-generic | 25 --- kernel/config-generic | 17 ++ kernel/config-i686-default | 377 -------------------------------- kernel/config-i686-legacy | 153 ------------- kernel/config-x86-generic | 161 ++++++++++++++ kernel/config-x86_64-default | 302 ------------------------- kernel/kernel.nm | 63 +----- kernel/scripts/configure | 29 +-- lrmi/lrmi.nm | 58 ----- lrmi/patches/lrmi-0.10-newheaders.patch | 39 ---- lrmi/patches/lrmi-0.9-build.patch0 | 24 -- 11 files changed, 181 insertions(+), 1067 deletions(-) delete mode 100644 kernel/config-i686-default delete mode 100644 kernel/config-i686-legacy delete mode 100644 kernel/config-x86_64-default delete mode 100644 lrmi/lrmi.nm delete mode 100644 lrmi/patches/lrmi-0.10-newheaders.patch delete mode 100644 lrmi/patches/lrmi-0.9-build.patch0 Difference in files: diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 085f04b..973441e 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -10,26 +10,9 @@ CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_ARCH_HAS_TICK_BROADCAST=y # -# Timers subsystem -# -# CONFIG_NO_HZ_IDLE is not set -CONFIG_NO_HZ_FULL=y -# CONFIG_NO_HZ_FULL_ALL is not set -# CONFIG_NO_HZ_FULL_SYSIDLE is not set - -# -# CPU/Task time and stats accounting -# -CONFIG_VIRT_CPU_ACCOUNTING=y -CONFIG_VIRT_CPU_ACCOUNTING_GEN=y - -# # RCU Subsystem # -CONFIG_CONTEXT_TRACKING=y -CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set # CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_PERF_USE_VMALLOC=y @@ -103,11 +86,6 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=m CONFIG_ARM_SCPI_CPUFREQ=m # -# Classification -# -CONFIG_BPF_JIT=y - -# # Bluetooth device drivers # # CONFIG_BT_HCIBTSDIO is not set @@ -327,7 +305,6 @@ CONFIG_GPIO_PL061=y # CONFIG_CHARGER_TWL4030 is not set # CONFIG_CHARGER_MAX8997 is not set # CONFIG_CHARGER_MAX8998 is not set -CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_VEXPRESS=y # @@ -397,7 +374,6 @@ CONFIG_DVB_TTUSB_DEC=y # CONFIG_DVB_PT1 is not set # CONFIG_MANTIS_CORE is not set # CONFIG_DVB_NGENE is not set -# CONFIG_VIDEO_CAFE_CCIC is not set # # DVB-S (satellite) frontends @@ -681,6 +657,5 @@ CONFIG_CRYPTO_XTS=m # # Library routines # -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_AUDIT_GENERIC=y CONFIG_LIBFDT=y diff --git a/kernel/config-generic b/kernel/config-generic index 34efb89..8b2c287 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -60,12 +60,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set +# CONFIG_NO_HZ_IDLE is not set +CONFIG_NO_HZ_FULL=y +# CONFIG_NO_HZ_FULL_ALL is not set +# CONFIG_NO_HZ_FULL_SYSIDLE is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # # CPU/Task time and stats accounting # +CONFIG_VIRT_CPU_ACCOUNTING=y +CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y @@ -81,7 +87,10 @@ CONFIG_TREE_RCU=y CONFIG_SRCU=y # CONFIG_TASKS_RCU is not set CONFIG_RCU_STALL_COMMON=y +CONFIG_CONTEXT_TRACKING=y # CONFIG_TREE_RCU_TRACE is not set +CONFIG_RCU_NOCB_CPU=y +# CONFIG_RCU_NOCB_CPU_ZERO is not set # CONFIG_RCU_EXPEDITE_BOOT is not set # CONFIG_BUILD_BIN2C is not set # CONFIG_IKCONFIG is not set @@ -190,6 +199,8 @@ CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_OLD_SIGSUSPEND3=y @@ -386,6 +397,7 @@ CONFIG_PCIE_PME=y CONFIG_BINFMT_ELF=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_NET=y @@ -915,6 +927,7 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y +CONFIG_BPF_JIT=y CONFIG_NET_FLOW_LIMIT=y # @@ -1011,6 +1024,7 @@ CONFIG_RFKILL_INPUT=y # CONFIG_CEPH_LIB is not set # CONFIG_NFC is not set CONFIG_LWTUNNEL=y +CONFIG_HAVE_BPF_JIT=y # # Device Drivers @@ -2469,6 +2483,7 @@ CONFIG_CHARGER_MAX77693=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_AXP20X_POWER is not set CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_LTC2952=y @@ -3115,6 +3130,7 @@ CONFIG_DVB_PT3=m # CONFIG_DVB_DDBRIDGE is not set CONFIG_DVB_SMIPCIE=m CONFIG_V4L_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_CAFE_CCIC is not set CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m # CONFIG_VIDEO_XILINX is not set @@ -5216,6 +5232,7 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IO=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC_T10DIF=y diff --git a/kernel/config-i686-default b/kernel/config-i686-default deleted file mode 100644 index 47d5994..0000000 --- a/kernel/config-i686-default +++ /dev/null @@ -1,377 +0,0 @@ -# CONFIG_64BIT is not set -CONFIG_X86_32=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_X86_32_SMP=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_PGTABLE_LEVELS=3 - -# -# Timers subsystem -# -CONFIG_NO_HZ_IDLE=y - -# -# CPU/Task time and stats accounting -# -# CONFIG_TICK_CPU_ACCOUNTING is not set -CONFIG_IRQ_TIME_ACCOUNTING=y - -# -# Kernel Performance Events And Counters -# -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -CONFIG_LBDAF=y - -# -# Processor type and features -# -CONFIG_X86_BIGSMP=y -# CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_QUARK=y -CONFIG_IOSF_MBI=y -# CONFIG_X86_RDC321X is not set -CONFIG_X86_32_NON_STANDARD=y -# CONFIG_STA2X11 is not set -CONFIG_X86_32_IRIS=m -# CONFIG_LGUEST_GUEST is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -CONFIG_M686=y -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MELAN is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -CONFIG_X86_GENERIC=y -# CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -# CONFIG_X86_ANCIENT_MCE is not set -# CONFIG_X86_LEGACY_VM86 is not set -CONFIG_TOSHIBA=m -# CONFIG_X86_REBOOTFIXUPS is not set -# CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y -# CONFIG_NUMA is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ILLEGAL_POINTER_VALUE=0 -CONFIG_FLATMEM_MANUAL=y -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_HIGHPTE=y -CONFIG_PHYSICAL_START=0x400000 -CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000 -CONFIG_PHYSICAL_ALIGN=0x400000 - -# -# Power management and ACPI options -# -CONFIG_X86_APM_BOOT=y -CONFIG_APM=y -# CONFIG_APM_IGNORE_USER_SUSPEND is not set -# CONFIG_APM_DO_ENABLE is not set -CONFIG_APM_CPU_IDLE=y -# CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_ALLOW_INTS is not set - -# -# CPU frequency scaling drivers -# -# CONFIG_X86_POWERNOW_K6 is not set -CONFIG_X86_POWERNOW_K7=y -CONFIG_X86_POWERNOW_K7_ACPI=y -# CONFIG_X86_GX_SUSPMOD is not set -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -CONFIG_X86_LONGRUN=y -# CONFIG_X86_LONGHAUL is not set -# CONFIG_X86_E_POWERSAVER is not set - -# -# shared options -# -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set - -# -# Bus options (PCI etc.) -# -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -# CONFIG_PCI_PRI is not set - -# -# PCI host controller drivers -# -# CONFIG_ISA is not set -# CONFIG_SCx200 is not set -# CONFIG_ALIX is not set -# CONFIG_NET5501 is not set -# CONFIG_GEOS is not set - -# -# PC-card bridges -# -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_IBM is not set -# CONFIG_HOTPLUG_PCI_SHPC is not set - -# -# Executable file formats / Emulations -# -# CONFIG_BINFMT_AOUT is not set - -# -# Misc devices -# -CONFIG_IBM_ASM=m -# CONFIG_SGI_IOC4 is not set -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m -CONFIG_PCH_PHUB=m - -# -# SCSI Transports -# -# CONFIG_SCSI_FLASHPOINT is not set -# CONFIG_SCSI_NSP32 is not set - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -# CONFIG_PATA_CS5535 is not set -CONFIG_PATA_CS5536=m -# CONFIG_PATA_SC1200 is not set - -# -# Distributed Switch Architecture drivers -# -CONFIG_PCH_GBE=m - -# -# Input Device Drivers -# -# CONFIG_KEYBOARD_STMPE is not set -# CONFIG_INPUT_WISTRON_BTNS is not set - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_PCH_UART is not set -CONFIG_HW_RANDOM_GEODE=m -CONFIG_SONYPI=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_DESIGNWARE_BAYTRAIL=y -# CONFIG_I2C_EG20T is not set -# CONFIG_I2C_PXA is not set - -# -# Other I2C/SMBus bus drivers -# -CONFIG_SCx200_ACB=m - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PTP_1588_CLOCK_PCH=m - -# -# MFD GPIO expanders -# -CONFIG_GPIO_CS5535=m -# CONFIG_GPIO_TC3589X is not set - -# -# PCI GPIO expanders -# -CONFIG_GPIO_PCH=m - -# -# USB GPIO expanders -# -# CONFIG_POWER_RESET_AS3722 is not set - -# -# ACPI drivers -# -CONFIG_INTEL_QUARK_DTS_THERMAL=m - -# -# Watchdog Device Drivers -# -CONFIG_GEODE_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_SBC7240_WDT=m - -# -# Multifunction device drivers -# -CONFIG_MFD_CS5535=m - -# -# STMicroelectronics STMPE Interface Drivers -# -# CONFIG_MFD_TIMBERDALE is not set - -# -# Media digital TV PCI Adapters -# -CONFIG_VIDEO_CAFE_CCIC=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7670=m - -# -# Graphics support -# -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set -# CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_EFFICEON is not set - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_I810 is not set -# CONFIG_FB_GEODE is not set -# CONFIG_BACKLIGHT_OT200 is not set - -# -# Console display driver support -# -CONFIG_SND_SB16_DSP=m -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -# CONFIG_SND_SIS7019 is not set - -# -# LED drivers -# -CONFIG_LEDS_OT200=m - -# -# iptables trigger is under Netfilter config (LED target) -# -# CONFIG_EDAC_AMD76X is not set -# CONFIG_EDAC_E7XXX is not set -# CONFIG_EDAC_I82875P is not set -# CONFIG_EDAC_I82860 is not set -# CONFIG_EDAC_R82600 is not set - -# -# DMA Devices -# -CONFIG_PCH_DMA=m - -# -# Microsoft Hyper-V guest support -# -CONFIG_TC1100_WMI=m -CONFIG_INTEL_IMR=y - -# -# Clock Source drivers -# -CONFIG_CLKSRC_I8253=y - -# -# Memory Debugging -# -# CONFIG_DEBUG_HIGHMEM is not set - -# -# Runtime Testing -# -# CONFIG_DEBUG_IMR_SELFTEST is not set - -# -# Security options -# -# CONFIG_INTEL_TXT is not set - -# -# Crypto core or helper -# -CONFIG_CRYPTO_GLUE_HELPER_X86=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES_586=y -CONFIG_CRYPTO_SALSA20_586=m -CONFIG_CRYPTO_SERPENT_SSE2_586=m -CONFIG_CRYPTO_TWOFISH_586=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_DEV_GEODE=m - -# -# Certificates for signature checking -# -# CONFIG_LGUEST is not set - -# -# Library routines -# -CONFIG_AUDIT_GENERIC=y diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy deleted file mode 100644 index bafe9ab..0000000 --- a/kernel/config-i686-legacy +++ /dev/null @@ -1,153 +0,0 @@ -CONFIG_PGTABLE_LEVELS=2 - -# -# Processor type and features -# -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_PHYS_ADDR_T_64BIT is not set - -# -# Bus options (PCI etc.) -# -# CONFIG_PCI_GOOLPC is not set -CONFIG_PCI_OLPC=y - -# -# PCI host controller drivers -# -CONFIG_OLPC=y -CONFIG_OLPC_XO1_PM=y -CONFIG_OLPC_XO1_RTC=y -CONFIG_OLPC_XO1_SCI=y -CONFIG_OLPC_XO15_SCI=y - -# -# Generic Driver Options -# -CONFIG_DMA_CMA=y - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 - -# -# Bus devices -# -CONFIG_OF_PROMTREE=y - -# -# Input Device Drivers -# -CONFIG_KEYBOARD_STMPE=m -CONFIG_KEYBOARD_TC3589X=m -CONFIG_MOUSE_PS2_OLPC=y -CONFIG_INPUT_MAX77693_HAPTIC=m -CONFIG_INPUT_MAX8997_HAPTIC=m -# CONFIG_INPUT_GPIO_BEEPER is not set -CONFIG_INPUT_PWM_BEEPER=m - -# -# Hardware I/O ports -# -# CONFIG_SERIO_OLPC_APSP is not set - -# -# Serial drivers -# -# CONFIG_SERIAL_8250_DW is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_OF_PLATFORM=y - -# -# Pin controllers -# -CONFIG_PINCTRL_AS3722=y - -# -# MFD GPIO expanders -# -CONFIG_GPIO_CS5535=y - -# -# USB GPIO expanders -# -CONFIG_BATTERY_OLPC=y -CONFIG_POWER_RESET_AS3722=y - -# -# Native drivers -# -CONFIG_SENSORS_PWM_FAN=m - -# -# ACPI drivers -# -# CONFIG_THERMAL_OF is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_RK808=y - -# -# STMicroelectronics STMPE Interface Drivers -# -CONFIG_REGULATOR_PWM=m - -# -# Frame buffer hardware drivers -# -CONFIG_BACKLIGHT_PWM=m -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_LP8788 is not set - -# -# LED drivers -# -CONFIG_LEDS_PWM=m - -# -# Microsoft Hyper-V guest support -# -CONFIG_XO1_RFKILL=m -# CONFIG_XO15_EBOOK is not set - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_SI5351 is not set -CONFIG_COMMON_CLK_PWM=m - -# -# Temperature sensors -# -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_ATMEL_HLCDC_PWM=m -CONFIG_PWM_CRC=y -CONFIG_PWM_FSL_FTM=m -CONFIG_PWM_LP3943=m -CONFIG_PWM_LPSS=m -CONFIG_PWM_LPSS_PCI=m -CONFIG_PWM_LPSS_PLATFORM=m -CONFIG_PWM_PCA9685=m -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m - -# -# Random Number Generation -# -# CONFIG_CRYPTO_DEV_HIFN_795X is not set diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index f9c4463..42fde91 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -1,7 +1,12 @@ +CONFIG_64BIT=y +CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y @@ -9,9 +14,14 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_X86_64_SMP=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_PGTABLE_LEVELS=4 # # General setup @@ -38,7 +48,13 @@ CONFIG_GENERIC_CMOS_UPDATE=y # # RCU Subsystem # +CONFIG_CONTEXT_TRACKING_FORCE=y +# CONFIG_RCU_NOCB_CPU_NONE is not set +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_ARCH_SUPPORTS_INT128=y +# CONFIG_NUMA_BALANCING is not set CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_PCSPKR_PLATFORM=y @@ -51,6 +67,15 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_COMPAT_OLD_SIGACTION=y + +# +# Partition Types +# +CONFIG_BLOCK_COMPAT=y # # IO Schedulers @@ -65,11 +90,16 @@ CONFIG_QUEUED_RWLOCKS=y # Processor type and features # CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y CONFIG_X86_EXTENDED_PLATFORM=y +CONFIG_X86_NUMACHIP=y +# CONFIG_X86_VSMP is not set +# CONFIG_X86_UV is not set # CONFIG_X86_GOLDFISH is not set CONFIG_X86_INTEL_LPSS=y # CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_IOSF_MBI=m # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -82,13 +112,16 @@ CONFIG_KVM_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_MK8 is not set +# CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -97,6 +130,9 @@ CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y +CONFIG_GART_IOMMU=y +# CONFIG_CALGARY_IOMMU is not set +# CONFIG_MAXSMP is not set CONFIG_NR_CPUS=64 CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y @@ -108,6 +144,7 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y # CONFIG_VM86 is not set +CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_I8K=m CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y @@ -117,10 +154,28 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_CPUID=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_X86_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=9 CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y +# CONFIG_MOVABLE_NODE is not set +# CONFIG_MEMORY_HOTPLUG is not set CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_VIRT_TO_BUS=y @@ -149,22 +204,32 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_MPX=y CONFIG_EFI=y CONFIG_EFI_STUB=y +# CONFIG_EFI_MIXED is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 # CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set CONFIG_CRASH_DUMP=y +CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y +CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000 CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set +# CONFIG_LEGACY_VSYSCALL_NATIVE is not set +# CONFIG_LEGACY_VSYSCALL_EMULATE is not set +CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set # CONFIG_MODIFY_LDT_SYSCALL is not set +# CONFIG_LIVEPATCH is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y # # Power management and ACPI options @@ -192,6 +257,7 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y # CONFIG_ACPI_DEBUG is not set @@ -245,6 +311,12 @@ CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_INTEL_IDLE=y # +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# # Bus options (PCI etc.) # CONFIG_PCI_DIRECT=y @@ -262,6 +334,7 @@ CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_LABEL=y @@ -287,13 +360,24 @@ CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m # CONFIG_RAPIDIO is not set # CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations # +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_IA32_EMULATION=y +# CONFIG_IA32_AOUT is not set +# CONFIG_X86_X32 is not set +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y +CONFIG_COMPAT_NETLINK_MESSAGES=y # # Classification @@ -342,6 +426,7 @@ CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_UMEM=m +CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_BLK_DEV_HD is not set @@ -352,6 +437,8 @@ CONFIG_BLK_DEV_NVME=m # Misc devices # CONFIG_SENSORS_LIS3LV02D=m +# CONFIG_IBM_ASM is not set +CONFIG_SGI_IOC4=m CONFIG_HP_ILO=m CONFIG_VMWARE_BALLOON=m # CONFIG_SRAM is not set @@ -365,8 +452,19 @@ CONFIG_INTEL_MEI_TXE=m CONFIG_VMWARE_VMCI=m # +# Intel MIC Bus Driver +# +CONFIG_INTEL_MIC_BUS=m + +# +# SCIF Bus Driver +# +# CONFIG_SCIF_BUS is not set + +# # Intel MIC Coprocessor State Management (COSM) Drivers # +# CONFIG_GENWQE is not set # CONFIG_IDE is not set # @@ -381,6 +479,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y CONFIG_VMWARE_PVSCSI=m CONFIG_FCOE_FNIC=m CONFIG_SCSI_EATA=m @@ -439,6 +538,10 @@ CONFIG_AMD8111_ETH=m CONFIG_MACB=m CONFIG_BNX2X_SRIOV=y CONFIG_BNXT_SRIOV=y +CONFIG_THUNDER_NIC_PF=m +CONFIG_THUNDER_NIC_VF=m +CONFIG_THUNDER_NIC_BGX=m +CONFIG_LIQUIDIO=m CONFIG_CHELSIO_T1_1G=y CONFIG_CX_ECAT=m CONFIG_DE2104X=m @@ -448,12 +551,15 @@ CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y CONFIG_DE4X5=m CONFIG_PCMCIA_XIRCOM=m +CONFIG_IGB_DCA=y +CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_I40E_VXLAN=y CONFIG_I40EVF=m CONFIG_FM10K=m CONFIG_FM10K_VXLAN=y CONFIG_SKGE_GENESIS=y +CONFIG_MYRI10GE_DCA=y CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_VXLAN=y CONFIG_ATP=m @@ -467,6 +573,7 @@ CONFIG_NET_SB1000=m # # MII PHY device drivers # +CONFIG_MDIO_OCTEON=m # CONFIG_PLIP is not set CONFIG_AIRO=m # CONFIG_WIL6210_TRACING is not set @@ -497,6 +604,7 @@ CONFIG_INPUT_MATRIXKMAP=m # CONFIG_KEYBOARD_ADP5520=m CONFIG_KEYBOARD_SAMSUNG=m +CONFIG_KEYBOARD_STMPE=m CONFIG_KEYBOARD_CAP11XX=m CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_VMMOUSE=y @@ -573,9 +681,14 @@ CONFIG_I2C_MUX_PINCTRL=m # # PC SMBus host controller drivers # +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_ISMT=m CONFIG_I2C_NFORCE2_S4985=m +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set # # ACPI drivers @@ -650,6 +763,11 @@ CONFIG_GPIO_SCH=m # CONFIG_GPIO_SCH311X is not set # +# MFD GPIO expanders +# +CONFIG_GPIO_TC3589X=y + +# # PCI GPIO expanders # # CONFIG_GPIO_INTEL_MID is not set @@ -934,6 +1052,11 @@ CONFIG_DRM_GMA600=y CONFIG_DRM_GMA3600=y # +# Display Interface Bridges +# +CONFIG_HSA_AMD=m + +# # Frame buffer hardware drivers # # CONFIG_FB_ARC is not set @@ -1030,6 +1153,7 @@ CONFIG_EDAC_I7CORE=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m # # Platform RTC drivers @@ -1040,6 +1164,8 @@ CONFIG_RTC_DRV_CMOS=y # DMA Devices # CONFIG_DMA_ACPI=y +CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_MIC_X100_DMA=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m @@ -1047,6 +1173,8 @@ CONFIG_DW_DMAC_PCI=m # # DMA Clients # +CONFIG_DMA_ENGINE_RAID=y +CONFIG_DCA=m CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m @@ -1136,11 +1264,15 @@ CONFIG_PCC=y # Generic IOMMU Pagetable Support # CONFIG_IOMMU_IOVA=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_STATS=y +CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y # # SOC (System On Chip) specific Drivers @@ -1215,6 +1347,7 @@ CONFIG_UEFI_CPER=y # File systems # # CONFIG_FS_DAX is not set +CONFIG_QUOTACTL_COMPAT=y # # Pseudo filesystems @@ -1273,6 +1406,7 @@ CONFIG_DEBUG_WX=y CONFIG_DEBUG_NX_TEST=m CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 @@ -1295,6 +1429,7 @@ CONFIG_OPTIMIZE_INLINING=y # # Security options # +CONFIG_INTEL_TXT=y CONFIG_LSM_MMAP_MIN_ADDR=65536 # @@ -1302,6 +1437,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536 # CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_ABLK_HELPER=y +CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Block modes @@ -1314,11 +1450,34 @@ CONFIG_CRYPTO_XTS=y # CONFIG_CRYPTO_CRC32C_INTEL=y CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m +# CONFIG_CRYPTO_SHA1_MB is not set +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # +CONFIG_CRYPTO_AES_X86_64=y CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m # # Random Number Generation @@ -1341,6 +1500,7 @@ CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m @@ -1356,4 +1516,5 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set CONFIG_HAS_IOPORT_MAP=y CONFIG_UCS2_STRING=y +CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_MMIO_FLUSH=y diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default deleted file mode 100644 index 4dc0eb8..0000000 --- a/kernel/config-x86_64-default +++ /dev/null @@ -1,302 +0,0 @@ -CONFIG_64BIT=y -CONFIG_X86_64=y -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_ZONE_DMA32=y -CONFIG_AUDIT_ARCH=y -CONFIG_X86_64_SMP=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -CONFIG_PGTABLE_LEVELS=4 - -# -# Timers subsystem -# -# CONFIG_NO_HZ_IDLE is not set -CONFIG_NO_HZ_FULL=y -# CONFIG_NO_HZ_FULL_ALL is not set -# CONFIG_NO_HZ_FULL_SYSIDLE is not set - -# -# CPU/Task time and stats accounting -# -CONFIG_VIRT_CPU_ACCOUNTING=y -CONFIG_VIRT_CPU_ACCOUNTING_GEN=y - -# -# RCU Subsystem -# -CONFIG_CONTEXT_TRACKING=y -CONFIG_CONTEXT_TRACKING_FORCE=y -CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_NOCB_CPU_NONE is not set -# CONFIG_RCU_NOCB_CPU_ZERO is not set -CONFIG_RCU_NOCB_CPU_ALL=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_SUPPORTS_INT128=y -# CONFIG_NUMA_BALANCING is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_COMPAT_OLD_SIGACTION=y - -# -# Partition Types -# -CONFIG_BLOCK_COMPAT=y - -# -# Processor type and features -# -CONFIG_X86_X2APIC=y -CONFIG_X86_NUMACHIP=y -# CONFIG_X86_VSMP is not set -# CONFIG_X86_UV is not set -CONFIG_IOSF_MBI=m -# CONFIG_MPSC is not set -CONFIG_GENERIC_CPU=y -CONFIG_X86_MINIMUM_CPU_FAMILY=64 -CONFIG_GART_IOMMU=y -# CONFIG_CALGARY_IOMMU is not set -# CONFIG_MAXSMP is not set -CONFIG_X86_VSYSCALL_EMULATION=y -CONFIG_X86_DIRECT_GBPAGES=y -CONFIG_NUMA=y -CONFIG_AMD_NUMA=y -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y -# CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=9 -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y -CONFIG_SPARSEMEM_VMEMMAP=y -# CONFIG_MOVABLE_NODE is not set -# CONFIG_MEMORY_HOTPLUG is not set -# CONFIG_EFI_MIXED is not set -# CONFIG_KEXEC_FILE is not set -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000 -CONFIG_PHYSICAL_ALIGN=0x1000000 -# CONFIG_LEGACY_VSYSCALL_NATIVE is not set -# CONFIG_LEGACY_VSYSCALL_EMULATE is not set -CONFIG_LEGACY_VSYSCALL_NONE=y -# CONFIG_LIVEPATCH is not set -CONFIG_USE_PERCPU_NUMA_NODE_ID=y - -# -# Power management and ACPI options -# -CONFIG_ACPI_NUMA=y - -# -# Memory power savings -# -CONFIG_I7300_IDLE_IOAT_CHANNEL=y -CONFIG_I7300_IDLE=m - -# -# Bus options (PCI etc.) -# -CONFIG_PCI_PRI=y - -# -# PC-card bridges -# -CONFIG_HOTPLUG_PCI_SHPC=m - -# -# Executable file formats / Emulations -# -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set -# CONFIG_X86_X32 is not set -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y -CONFIG_X86_DEV_DMA_OPS=y -CONFIG_COMPAT_NETLINK_MESSAGES=y - -# -# Classification -# -CONFIG_BPF_JIT=y - -# -# Protocols -# -CONFIG_BLK_DEV_SKD=m - -# -# Misc devices -# -# CONFIG_IBM_ASM is not set -CONFIG_SGI_IOC4=m - -# -# Intel MIC Bus Driver -# -CONFIG_INTEL_MIC_BUS=m - -# -# SCIF Bus Driver -# -# CONFIG_SCIF_BUS is not set - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# -# CONFIG_GENWQE is not set - -# -# SCSI Transports -# -CONFIG_SCSI_FLASHPOINT=y - -# -# Distributed Switch Architecture drivers -# -CONFIG_THUNDER_NIC_PF=m -CONFIG_THUNDER_NIC_VF=m -CONFIG_THUNDER_NIC_BGX=m -CONFIG_LIQUIDIO=m -CONFIG_IGB_DCA=y -CONFIG_IXGBE_DCA=y -CONFIG_MYRI10GE_DCA=y - -# -# MII PHY device drivers -# -CONFIG_MDIO_OCTEON=m - -# -# Input Device Drivers -# -CONFIG_KEYBOARD_STMPE=m - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set - -# -# MFD GPIO expanders -# -CONFIG_GPIO_TC3589X=y - -# -# USB GPIO expanders -# -CONFIG_POWER_RESET_AS3722=y - -# -# Media digital TV PCI Adapters -# -# CONFIG_VIDEO_CAFE_CCIC is not set - -# -# Display Interface Bridges -# -CONFIG_HSA_AMD=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_EDAC_SBRIDGE=m - -# -# DMA Devices -# -CONFIG_INTEL_IOATDMA=m -CONFIG_INTEL_MIC_X100_DMA=m - -# -# DMA Clients -# -CONFIG_DMA_ENGINE_RAID=y -CONFIG_DCA=m - -# -# Generic IOMMU Pagetable Support -# -CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_STATS=y -CONFIG_AMD_IOMMU_V2=m -CONFIG_IRQ_REMAP=y - -# -# File systems -# -CONFIG_QUOTACTL_COMPAT=y - -# -# Runtime Testing -# -# CONFIG_IOMMU_DEBUG is not set - -# -# Security options -# -CONFIG_INTEL_TXT=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_GLUE_HELPER_X86=y - -# -# Digest -# -CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_POLY1305_X86_64=m -CONFIG_CRYPTO_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256_SSSE3=m -CONFIG_CRYPTO_SHA512_SSSE3=m -# CONFIG_CRYPTO_SHA1_MB is not set -CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES_X86_64=y -CONFIG_CRYPTO_BLOWFISH_X86_64=m -CONFIG_CRYPTO_CAMELLIA_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m -CONFIG_CRYPTO_CAST5_AVX_X86_64=m -CONFIG_CRYPTO_CAST6_AVX_X86_64=m -CONFIG_CRYPTO_DES3_EDE_X86_64=m -CONFIG_CRYPTO_SALSA20_X86_64=m -CONFIG_CRYPTO_CHACHA20_X86_64=m -CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m -CONFIG_CRYPTO_TWOFISH_X86_64=m -CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m -CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m - -# -# Certificates for signature checking -# -CONFIG_KVM_COMPAT=y - -# -# Library routines -# -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_HAS_PMEM_API=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 1514f50..4a3ac98 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,7 +4,7 @@ ############################################################################### name = kernel -version = 4.4.10 +version = 4.4.19 release = 1 thisapp = linux-%{version} @@ -60,11 +60,6 @@ build %{kernel_logo} end - # i686 needs librmi for cpupower. - if "%{DISTRO_ARCH}" == "i686" - requires += liblrmi-devel - end - # A list of kernels to build. kernels = @@ -75,13 +70,6 @@ build kernel_target = bzImage kernel_image = arch/%{kernel_arch}/boot/%{kernel_target} - if "%{DISTRO_ARCH}" == "i686" - # Build a default and legacy kernel for the - # i686 architecture. - build_kernel_default = 1 - build_kernel_legacy = 1 - end - if "%{DISTRO_ARCH}" == "x86_64" build_kernel_default = 1 end @@ -111,11 +99,6 @@ build kernels += default end - # Build legacy kernel. - if "%{build_kernel_legacy}" == "1" - kernels += legacy - end - perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \ NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \ NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core @@ -222,14 +205,6 @@ build make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= V=1 \ KERNELRELEASE=${fullversion} modules_install - # Install vdso. - case "%{DISTRO_ARCH}" in - i686) - make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \ - KERNELRELEASE=${fullversion} vdso_install - ;; - esac - # Create an empty settings file for dracut mkdir -p %{BUILDROOT}/etc/ld.so.conf.d echo "# Placeholder file, no vDSO hwcap entries used in this kernel." \ @@ -301,24 +276,11 @@ build pushd tools/power/cpupower/debug/x86_64 make %{MAKETUNING} centrino-decode powernow-k8-decode popd - elif [ "%{DISTRO_ARCH}" = "i686" ]; then - pushd tools/power/cpupower/debug/i386 - make %{MAKETUNING} centrino-decode powernow-k8-decode - popd - fi - # Should be built for all x86 architectures - if [ "%{DISTRO_ARCH}" = "x86_64" ]; then - # Won't compile on i686 - # x86_energy_perf_policy.c: In function ‘validate_cpuid’: - # x86_energy_perf_policy.c:154:2: error: PIC register clobbered by ‘ebx’ in ‘asm’ - # asm("cpuid" : "=a" (fms), "=c" (ecx), "=d" (edx) : "a" (1) : "ebx"); - # ^ pushd tools/power/x86/x86_energy_perf_policy make popd - # Same as above pushd tools/power/x86/turbostat make popd @@ -363,13 +325,6 @@ build install -m 755 powernow-k8-decode \ %{BUILDROOT}/usr/bin/powernow-k8-decode popd - elif [ "%{DISTRO_ARCH}" = "i686" ]; then - pushd tools/power/cpupower/debug/i386 - install -m 755 centrino-decode \ - %{BUILDROOT}/usr/bin/centrino-decode - install -m 755 powernow-k8-decode \ - %{BUILDROOT}/usr/bin/powernow-k8-decode - popd fi chmod 0755 %{BUILDROOT}%{libdir}/libcpupower.so* @@ -525,22 +480,6 @@ packages end end - if "%{build_kernel_legacy}" == "1" - package kernel-legacy - template KERNEL - - kernel_name = kernel-legacy - kernel_release = %{fullver}.legacy - end - - package kernel-legacy-devel - template KERNELDEVEL - - kernel_name = kernel-legacy - kernel_release = %{fullver}.legacy - end - end - package kernel-headers summary = Header files of the kernel release %{fullver}. desciption = %{summary} diff --git a/kernel/scripts/configure b/kernel/scripts/configure index 68a3c8a..397beb8 100755 --- a/kernel/scripts/configure +++ b/kernel/scripts/configure @@ -10,9 +10,6 @@ SCRIPTS_DIR=${BASEDIR} # x86_64 CONFIGS="x86_64:default" -# i686 -CONFIGS="${CONFIGS} i686:legacy i686:default" - # aarch64 CONFIGS="${CONFIGS} aarch64:default" @@ -67,7 +64,7 @@ function get_kernel_arch() { arm*) echo "arm" ;; - x86_64|i?86) + x86_64) echo "x86" ;; esac @@ -110,14 +107,7 @@ function merge_config() { case "${arch}:${flavour}" in # x86 x86_64:default) - configs="${configs} config-x86-generic config-x86_64-default" - ;; - i686:default) - configs="${configs} config-x86-generic config-i686-default" - ;; - i686:legacy) - configs="${configs} config-x86-generic config-i686-default" - configs="${configs} config-i686-legacy" + configs="${configs} config-x86-generic" ;; # ARM64 @@ -208,9 +198,6 @@ function make_oldconfig() { # config-generic # Intersection of all files. -# config-x86-generic -# Diff of (intersection of (i686-{default,legacy} and x86_64-default) -# against config-generic). # config-x86-x86_64 # Diff against merge of (config-generic and config-x86-generic). @@ -234,13 +221,6 @@ function diff_configs() { merge_config ${arch} ${flavour} ${filename} ${extra_configs} - # Do not include leaf configuration. - case "${config}" in - i686:legacy) - continue - ;; - esac - platform="$(get_platform "${arch}")" subplatform="$(get_subplatform "${arch}")" @@ -296,11 +276,6 @@ function diff_configs() { rm -f ${filename} continue ;; - i686:legacy) - # Legacy depends directly on the default configuration. - ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-default \ - ${filename} > ${filename}.tmp - ;; *) platform="$(get_subplatform "${arch}" || get_platform "${arch}")" ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${platform}-common \ diff --git a/lrmi/lrmi.nm b/lrmi/lrmi.nm deleted file mode 100644 index d174889..0000000 --- a/lrmi/lrmi.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = lrmi -version = 0.10 -release = 2 - -# This is only supported on i686. -sup_arches = i686 - -groups = System/Libraries -url = http://sourceforge.net/projects/lrmi/ -license = MIT -summary = Library for calling real mode BIOS routines. - -description - LRMI is a library for calling real mode BIOS routines. -end - -source_dl = http://download.sourceforge.net/lrmi/ - -build - requires - kernel-headers - end - - make_build_targets = liblrmi.so vbetest CFLAGS="%{CFLAGS}" - - install - make install LIBDIR=%{BUILDROOT}%{libdir} INCDIR=%{BUILDROOT}%{includedir} - install -D -p -m755 vbetest %{BUILDROOT}%{sbindir}/vbetest - end -end - -packages - package %{name} - provides += lib%{name} = %{thisver} - end - - package %{name}-devel - template DEVEL - - provides += lib%{name}-devel = %{thisver} - end - - package vbetest - summary = Utility for listing and testing VESA graphics modes - description = %{summary}. - - files = %{sbindir}/vbetest - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/lrmi/patches/lrmi-0.10-newheaders.patch b/lrmi/patches/lrmi-0.10-newheaders.patch deleted file mode 100644 index ae04c47..0000000 --- a/lrmi/patches/lrmi-0.10-newheaders.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up lrmi-0.10/lrmi.c.BAD lrmi-0.10/lrmi.c ---- lrmi-0.10/lrmi.c.BAD 2008-09-17 14:41:28.000000000 -0400 -+++ lrmi-0.10/lrmi.c 2008-09-17 14:45:17.000000000 -0400 -@@ -239,7 +239,7 @@ LRMI_free_real(void *m) - - - #if defined(__linux__) --#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) -+#define DEFAULT_VM86_FLAGS (X86_EFLAGS_IF | X86_EFLAGS_IOPL) - #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) - #define TF_MASK PSL_T -@@ -822,7 +822,7 @@ run_vm86(void) - - CONTEXT_REGS.REG(cs) = get_int_seg(v); - CONTEXT_REGS.REG(eip) = get_int_off(v); -- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK); -+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); - - continue; - } -@@ -862,7 +862,7 @@ vm86_callback(int sig, int code, struct - - CONTEXT_REGS.REG(cs) = get_int_seg(v); - CONTEXT_REGS.REG(eip) = get_int_off(v); -- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK); -+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); - - break; - } -@@ -916,7 +916,7 @@ vm86_callback(int sig, int code, struct - - CONTEXT_REGS.REG(cs) = get_int_seg(addr[1]); - CONTEXT_REGS.REG(eip) = get_int_off(addr[1]); -- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK); -+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); - } else { - if (emulate() == 0) { - context.success = 0; diff --git a/lrmi/patches/lrmi-0.9-build.patch0 b/lrmi/patches/lrmi-0.9-build.patch0 deleted file mode 100644 index 250f9cb..0000000 --- a/lrmi/patches/lrmi-0.9-build.patch0 +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile~ 2005-09-01 09:49:18.000000000 +0300 -+++ Makefile 2005-11-09 09:40:30.000000000 +0200 -@@ -30,17 +30,17 @@ - ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so - --vbetest: vbetest.c liblrmi.a -+vbetest: vbetest.c liblrmi.so - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ - - install: - mkdir -p $(LIBDIR) -- install -m 755 -s -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION) -+ install -m 755 -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION) - rm -f $(LIBDIR)/$(LIBNAME).so - ln -sf $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBDIR)/$(LIBNAME).so -- install -m 644 -s -p lrmi.h $(INCDIR)/lrmi.h -- ldconfig -+ mkdir -p $(INCDIR) -+ install -m 644 -p lrmi.h vbe.h $(INCDIR) - - .PHONY: clean - clean: hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 47f1e602e25df9ded46e92c77ab8cd076cb42f01
by git＠ipfire.org 07 Sep '16

07 Sep '16

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 3.x development tree". The branch, master has been updated via 47f1e602e25df9ded46e92c77ab8cd076cb42f01 (commit) via 9059d74c9a7a8b28bf61022bcbba5546fcd068f1 (commit) via 02021382dcd8ba66ea41827633bda1d3a5fe77e4 (commit) via 2ce1b647d3d78b1b3725736e7822052d740e629e (commit) via 67d97036e2bd677bb9eac83360161d72d04ad6a9 (commit) via fca5c2d6fc092012c0a3832a7c29cbed298f9d54 (commit) via 898eb07ff062c4c4f9bd86280f4f832dd82d1de2 (commit) via c9acb2fb3d1ea5ec60870eb07e154b4971e3bf92 (commit) via 4dfbc7afbc8aa5ebd67c7d94fefa02dd089726b2 (commit) via 4bb0f6b680d1f5d6aa4f349a51d4902aee6ce6c2 (commit) via 56c3ccb6dfb5cbaf2fa1b0e8c10b7a39b306c11e (commit) via eb62ddf34bc87c9e33dcd313f0eddcc6a56a5251 (commit) via 043565a04491228af8f48645cdaded2bfa35be1f (commit) via acf3f91c5e767d1098add1fc5e4a2816869a02ca (commit) from 9f4e560dc6e3af3740743580208c74ad3efc45fb (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 47f1e602e25df9ded46e92c77ab8cd076cb42f01 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Sep 3 10:13:28 2016 +0000 sip: update to 4.18.1 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9059d74c9a7a8b28bf61022bcbba5546fcd068f1 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Sep 3 10:21:25 2016 +0000 smartmontools: update to 6.5 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 02021382dcd8ba66ea41827633bda1d3a5fe77e4 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Sep 3 10:56:58 2016 +0000 sqlite: update to 3.14.1 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2ce1b647d3d78b1b3725736e7822052d740e629e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Sep 3 12:21:28 2016 +0000 strace: update to 4.13.1 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 67d97036e2bd677bb9eac83360161d72d04ad6a9 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Sep 3 12:29:44 2016 +0000 strongswan: update to 5.5.0 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fca5c2d6fc092012c0a3832a7c29cbed298f9d54 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Sep 3 14:56:03 2016 +0200 coreutils: Update to 8.25. This is an update to the latest stable version of coreutils. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 898eb07ff062c4c4f9bd86280f4f832dd82d1de2 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sun Sep 4 11:07:01 2016 +0000 libtdb: Update to 1.3.11 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c9acb2fb3d1ea5ec60870eb07e154b4971e3bf92 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 06:43:53 2016 +0000 swig: update to 3.0.10 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4dfbc7afbc8aa5ebd67c7d94fefa02dd089726b2 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 08:00:32 2016 +0000 tcpdump: Update to 4.7.4 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4bb0f6b680d1f5d6aa4f349a51d4902aee6ce6c2 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 08:10:32 2016 +0000 tinc: Update to 1.0.28 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 56c3ccb6dfb5cbaf2fa1b0e8c10b7a39b306c11e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 08:14:15 2016 +0000 tmux: Update to 2.2 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eb62ddf34bc87c9e33dcd313f0eddcc6a56a5251 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 08:17:30 2016 +0000 traceroute: Update to 2.1 The main significant change is new adaptive algorithm for waiting. Traditional traceroute implementation always waited the whole timeout (default 5.0 second) for any probe. But if we already have some replies from the same hop, or even from some next hop, we can use the round trip time of such a reply as a hint to determine the actual reasonable amount of time to wait. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 043565a04491228af8f48645cdaded2bfa35be1f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Sep 5 13:11:04 2016 +0200 perl-XML-Parser: Trigger rebuild to link against new perl ABI. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit acf3f91c5e767d1098add1fc5e4a2816869a02ca Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Sep 5 08:27:36 2016 +0000 tree: Update to 1.7.0 Allow user/group names up to 32 characters before clipping. Made -i compress XML and JSON output as much as possible by eliminating extraneous whitespace. Added --caseinsensitive (renamed --ignore-case ala grep) flag so patterns match without regard to case, courtesy of Jason A Donenfeld. Added --matchdirs option courtesy of Brian Mattern & Jason A. Donenfeld <Jason(a)zx2c4.com>. Fixed possible buffer overflow on large uid/gids w/o user names/group names (Alexandre Wendling <alexandrerw(a)celepar.pr.gov.br>) Added JSON support courtesy of Florian Sesser <fs(a)it-agenten.com>. Fixed formatting error with HTML output when -L 1 specified. (Sascha Zorn <sascha.zorn(a)gmail.com>) Added file size sorting (Philipp M?ller <philippausmuensing(a)googlemail.com>) Added '--sort[=]<name>' option, ala ls. Fixed OS X makefile problems (Ryan Hollis <theryanhollis(a)gmail.com>) Fixed possible memory overflow in read_dir (path/lbuf not equal in size to pathsize/lbufsize.) (Han Hui <hanhui03(a)163.com>) Fix S_ISDOOR/S_IFDOOR spelling mistake for Solaris. (Tim Mooney <Tim.Mooney(a)ndsu.edu>) Make tree more reliably detect UTF-8 locales. (Mantas Mikulnas <grawity(a)gmail.com> and others.) Return non-zero exit status on option errors, print usage to stdout when not an error, add the posix '--' option terminator, Change -S description to mean CP437 (console) output codes, not ASCII. (Ivan Shmakov <oneingray(a)gmail.com>) Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: coreutils/coreutils.nm | 5 +- coreutils/patches/coreutils-i18n.patch | 666 ++++++++++++--------- .../patches/coreutils-ipfire-disabled-tests.patch | 23 +- libtdb/libtdb.nm | 2 +- perl-XML-Parser/perl-XML-Parser.nm | 2 +- sip/sip.nm | 8 +- smartmontools/smartmontools.nm | 4 +- sqlite/sqlite.nm | 6 +- .../0001-linux-aarch64-add-missing-header.patch | 25 - strace/strace.nm | 2 +- strongswan/strongswan.nm | 2 +- swig/patches/swig-1.3.23-pylib.patch | 29 - swig/patches/swig200-rh623854.patch | 92 --- swig/swig.nm | 2 +- tcpdump/tcpdump.nm | 4 +- tinc/tinc.nm | 2 +- tmux/tmux.nm | 4 +- traceroute/traceroute.nm | 2 +- tree/patches/tree-args.patch | 12 - tree/patches/tree-no-color-by-default.patch | 13 - tree/patches/tree-no-strip.patch | 21 - tree/patches/tree-preserve-timestamps.patch | 15 - tree/tree.nm | 2 +- 23 files changed, 415 insertions(+), 528 deletions(-) delete mode 100644 strace/patches/0001-linux-aarch64-add-missing-header.patch delete mode 100644 swig/patches/swig-1.3.23-pylib.patch delete mode 100644 swig/patches/swig200-rh623854.patch delete mode 100644 tree/patches/tree-args.patch delete mode 100644 tree/patches/tree-no-color-by-default.patch delete mode 100644 tree/patches/tree-no-strip.patch delete mode 100644 tree/patches/tree-preserve-timestamps.patch Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index af1dae7..3a102ac 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = coreutils -version = 8.23 +version = 8.25 release = 1 groups = System/Base @@ -54,6 +54,9 @@ build autoreconf -vfi end + make_build_targets += \ + V=1 + test make check end diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index eda68eb..ad984ec 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -1,26 +1,13 @@ -Submitted by: Matt Burgess (matthew_at_linuxfromscratch_dot_org) -Date: 2013-12-16 -Initial Package Version: 8.22 (Rebased for version 8.23 by bdubbs(a)linuxfromscratch.org)) +Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) +Date: 2016-02-09 +Initial Package Version: 8.25 Upstream Status: Rejected -Origin: Based on Fedora's i18n patch at - http://pkgs.fedoraproject.org/cgit/coreutils.git/plain/coreutils-i18n.patch +Origin: Based on Suse's i18n patches at https://build.opensuse.org/package/view_file/Base:System/coreutils/coreutil… Description: Fixes several i18n issues with various Coreutils programs - -diff -Naur coreutils-8.23.orig/Makefile.in coreutils-8.23/Makefile.in ---- coreutils-8.23.orig/Makefile.in 2014-07-18 17:22:24.000000000 -0500 -+++ coreutils-8.23/Makefile.in 2014-07-18 22:36:17.404066931 -0500 -@@ -5057,6 +5057,7 @@ - tests/misc/chcon.sh \ - tests/misc/chroot-credentials.sh \ - tests/misc/selinux.sh \ -+ tests/misc/sort-mb-tests.sh \ - tests/misc/truncate-owned-by-other.sh \ - tests/mkdir/writable-under-readonly.sh \ - tests/mkdir/smack-root.sh \ -diff -Naur coreutils-8.23.orig/lib/linebuffer.h coreutils-8.23/lib/linebuffer.h ---- coreutils-8.23.orig/lib/linebuffer.h 2014-05-29 07:05:50.000000000 -0500 -+++ coreutils-8.23/lib/linebuffer.h 2014-07-18 22:36:17.392067256 -0500 +diff -Naurp coreutils-8.25-orig/lib/linebuffer.h coreutils-8.25/lib/linebuffer.h +--- coreutils-8.25-orig/lib/linebuffer.h 2016-01-01 07:45:55.000000000 -0600 ++++ coreutils-8.25/lib/linebuffer.h 2016-02-08 19:07:10.298944609 -0600 @@ -21,6 +21,11 @@ # include <stdio.h> @@ -33,7 +20,7 @@ diff -Naur coreutils-8.23.orig/lib/linebuffer.h coreutils-8.23/lib/linebuffer.h /* A 'struct linebuffer' holds a line of text. */ struct linebuffer -@@ -28,6 +33,9 @@ +@@ -28,6 +33,9 @@ struct linebuffer size_t size; /* Allocated. */ size_t length; /* Used. */ char *buffer; @@ -43,9 +30,9 @@ diff -Naur coreutils-8.23.orig/lib/linebuffer.h coreutils-8.23/lib/linebuffer.h }; /* Initialize linebuffer LINEBUFFER for use. */ -diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c ---- coreutils-8.23.orig/src/cut.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/cut.c 2014-07-18 22:44:56.489482312 -0500 +diff -Naurp coreutils-8.25-orig/src/cut.c coreutils-8.25/src/cut.c +--- coreutils-8.25-orig/src/cut.c 2016-01-13 05:08:59.000000000 -0600 ++++ coreutils-8.25/src/cut.c 2016-02-08 19:07:10.300944616 -0600 @@ -28,6 +28,11 @@ #include <assert.h> #include <getopt.h> @@ -58,9 +45,9 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c #include "system.h" #include "error.h" -@@ -37,6 +42,18 @@ - #include "quote.h" - #include "xstrndup.h" +@@ -38,6 +43,18 @@ + + #include "set-fields.h" +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC + installation; work around this configuration error. */ @@ -77,7 +64,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "cut" -@@ -53,6 +70,52 @@ +@@ -54,6 +71,52 @@ } \ while (0) @@ -128,18 +115,19 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + while (0) + - struct range_pair - { -@@ -75,6 +138,8 @@ - /* Number of `struct range_pair's allocated. */ - static size_t n_rp_allocated; + /* Pointer inside RP. When checking if a byte or field is selected + by a finite range, we check if it is between CURRENT_RP.LO +@@ -61,6 +124,9 @@ + CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */ + static struct field_range_pair *current_rp; +/* Length of the delimiter given as argument to -d. */ +size_t delimlen; - - /* Append LOW, HIGH to the list RP of range pairs, allocating additional - space if necessary. Update global variable N_RP. When allocating, -@@ -106,15 +171,25 @@ ++ + /* This buffer is used to support the semantics of the -s option + (or lack of same) when the specified field list includes (does + not include) the first field. In both of those cases, the entire +@@ -77,15 +143,25 @@ enum operating_mode { undefined_mode, @@ -166,7 +154,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c /* If true do not output lines containing no delimiter characters. Otherwise, all such lines are printed. This option is valid only with field mode. */ -@@ -126,6 +201,9 @@ +@@ -97,6 +173,9 @@ static bool complement; /* The delimiter character for field mode. */ static unsigned char delim; @@ -174,9 +162,9 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c +static wchar_t wcdelim; +#endif - /* True if the --output-delimiter=STRING option was specified. */ - static bool output_delimiter_specified; -@@ -188,7 +266,7 @@ + /* The delimiter for each line/record. */ + static unsigned char line_delim = '\n'; +@@ -164,7 +243,7 @@ Print selected parts of lines from each -f, --fields=LIST select only these fields; also print any line\n\ that contains no delimiter character, unless\n\ the -s option is specified\n\ @@ -185,17 +173,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c "), stdout); fputs (_("\ --complement complement the set of selected bytes, characters\n\ -@@ -381,6 +459,9 @@ - if (operating_mode == byte_mode) - error (0, 0, - _("byte offset %s is too large"), quote (bad_num)); -+ else if (operating_mode == character_mode) -+ error (0, 0, -+ _("character offset %s is too large"), quote (bad_num)); - else - error (0, 0, - _("field number %s is too large"), quote (bad_num)); -@@ -505,6 +586,82 @@ +@@ -280,6 +359,82 @@ cut_bytes (FILE *stream) } } @@ -229,7 +207,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + bufpos = buf; + memset (&state, '\0', sizeof(mbstate_t)); + -+ current_rp = rp; ++ current_rp = frp; + + while (1) + { @@ -241,15 +219,15 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + if (wc == WEOF) + { + if (idx > 0) -+ putchar ('\n'); ++ putchar (line_delim); + break; + } -+ else if (wc == L'\n') ++ else if (wc == line_delim) + { -+ putchar ('\n'); ++ putchar (line_delim); + idx = 0; + print_delimiter = false; -+ current_rp = rp; ++ current_rp = frp; + } + else + { @@ -278,7 +256,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c /* Read from stream STREAM, printing to standard output any selected fields. */ static void -@@ -649,13 +806,211 @@ +@@ -425,13 +580,211 @@ cut_fields (FILE *stream) } } @@ -300,7 +278,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + mbstate_t state; /* State of the stream. */ + bool convfail = false; /* true, when conversion failed. Otherwise false. */ + -+ current_rp = rp; ++ current_rp = frp; + + found_any_selected_field = 0; + field_idx = 1; @@ -348,7 +326,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + buflen -= mblength; + bufpos += mblength; + -+ if (!convfail && (wc == L'\n' || wc == wcdelim)) ++ if (!convfail && (wc == line_delim || wc == wcdelim)) + break; + } + @@ -368,8 +346,8 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + { + fwrite (field_1_buffer, sizeof (char), len, stdout); + /* Make sure the output line is newline terminated. */ -+ if (convfail || (!convfail && wc != L'\n')) -+ putchar ('\n'); ++ if (convfail || (!convfail && wc != line_delim)) ++ putchar (line_delim); + } + continue; + } @@ -404,7 +382,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + + if (wc == WEOF) + break; -+ else if (!convfail && (wc == wcdelim || wc == L'\n')) ++ else if (!convfail && (wc == wcdelim || wc == line_delim)) + { + buflen -= mblength; + bufpos += mblength; @@ -419,20 +397,20 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c + } + } + -+ if ((!convfail || wc == L'\n') && buflen < 1) ++ if ((!convfail || wc == line_delim) && buflen < 1) + wc = WEOF; + + if (!convfail && wc == wcdelim) + next_item (&field_idx); -+ else if (wc == WEOF || (!convfail && wc == L'\n')) ++ else if (wc == WEOF || (!convfail && wc == line_delim)) + { + if (found_any_selected_field + || (!empty_input && !(suppress_non_delimited && field_idx == 1))) -+ putchar ('\n'); ++ putchar (line_delim); + if (wc == WEOF) + break; + field_idx = 1; -+ current_rp = rp; ++ current_rp = frp; + found_any_selected_field = 0; + } + } @@ -493,7 +471,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c } /* Process file FILE to standard output. -@@ -707,6 +1062,7 @@ +@@ -483,6 +836,7 @@ main (int argc, char **argv) bool ok; bool delim_specified = false; char *spec_list_string IF_LINT ( = NULL); @@ -501,7 +479,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c initialize_main (&argc, &argv); set_program_name (argv[0]); -@@ -729,7 +1085,6 @@ +@@ -505,7 +859,6 @@ main (int argc, char **argv) switch (optc) { case 'b': @@ -509,7 +487,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c /* Build the byte list. */ if (operating_mode != undefined_mode) FATAL_ERROR (_("only one type of list may be specified")); -@@ -737,6 +1092,14 @@ +@@ -513,6 +866,14 @@ main (int argc, char **argv) spec_list_string = optarg; break; @@ -524,7 +502,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c case 'f': /* Build the field list. */ if (operating_mode != undefined_mode) -@@ -748,10 +1111,38 @@ +@@ -524,10 +885,38 @@ main (int argc, char **argv) case 'd': /* New delimiter. */ /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ @@ -567,7 +545,7 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c break; case OUTPUT_DELIMITER_OPTION: -@@ -764,6 +1155,7 @@ +@@ -540,6 +929,7 @@ main (int argc, char **argv) break; case 'n': @@ -575,8 +553,8 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c break; case 's': -@@ -803,15 +1195,34 @@ - } +@@ -579,15 +969,34 @@ main (int argc, char **argv) + | (complement ? SETFLD_COMPLEMENT : 0) ); if (!delim_specified) - delim = '\t'; @@ -616,9 +594,9 @@ diff -Naur coreutils-8.23.orig/src/cut.c coreutils-8.23/src/cut.c } if (optind == argc) -diff -Naur coreutils-8.23.orig/src/expand.c coreutils-8.23/src/expand.c ---- coreutils-8.23.orig/src/expand.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/expand.c 2014-07-18 22:36:17.394067191 -0500 +diff -Naurp coreutils-8.25-orig/src/expand.c coreutils-8.25/src/expand.c +--- coreutils-8.25-orig/src/expand.c 2016-01-01 07:48:50.000000000 -0600 ++++ coreutils-8.25/src/expand.c 2016-02-08 19:07:10.301944619 -0600 @@ -37,12 +37,34 @@ #include <stdio.h> #include <getopt.h> @@ -654,7 +632,7 @@ diff -Naur coreutils-8.23.orig/src/expand.c coreutils-8.23/src/expand.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "expand" -@@ -357,6 +379,142 @@ +@@ -357,6 +379,142 @@ expand (void) } } @@ -797,7 +775,7 @@ diff -Naur coreutils-8.23.orig/src/expand.c coreutils-8.23/src/expand.c int main (int argc, char **argv) { -@@ -421,7 +579,12 @@ +@@ -421,7 +579,12 @@ main (int argc, char **argv) file_list = (optind < argc ? &argv[optind] : stdin_argv); @@ -811,10 +789,10 @@ diff -Naur coreutils-8.23.orig/src/expand.c coreutils-8.23/src/expand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c ---- coreutils-8.23.orig/src/fold.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/fold.c 2014-07-18 22:36:17.394067191 -0500 -@@ -22,12 +22,34 @@ +diff -Naurp coreutils-8.25-orig/src/fold.c coreutils-8.25/src/fold.c +--- coreutils-8.25-orig/src/fold.c 2016-01-01 07:48:50.000000000 -0600 ++++ coreutils-8.25/src/fold.c 2016-02-08 19:07:10.302944622 -0600 +@@ -22,11 +22,33 @@ #include <getopt.h> #include <sys/types.h> @@ -831,8 +809,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c #include "system.h" #include "error.h" #include "fadvise.h" - #include "quote.h" - #include "xstrtol.h" + #include "xdectoint.h" +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC + installation; work around this configuration error. */ @@ -849,7 +826,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c #define TAB_WIDTH 8 /* The official name of this program (e.g., no 'g' prefix). */ -@@ -35,20 +57,41 @@ +@@ -34,20 +56,41 @@ #define AUTHORS proper_name ("David MacKenzie") @@ -895,7 +872,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c {"spaces", no_argument, NULL, 's'}, {"width", required_argument, NULL, 'w'}, {GETOPT_HELP_OPTION_DECL}, -@@ -76,6 +119,7 @@ +@@ -75,6 +118,7 @@ Wrap input lines in each FILE, writing t fputs (_("\ -b, --bytes count bytes rather than columns\n\ @@ -903,7 +880,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c -s, --spaces break at spaces\n\ -w, --width=WIDTH use WIDTH columns instead of 80\n\ "), stdout); -@@ -93,7 +137,7 @@ +@@ -92,7 +136,7 @@ Wrap input lines in each FILE, writing t static size_t adjust_column (size_t column, char c) { @@ -912,7 +889,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c { if (c == '\b') { -@@ -116,30 +160,14 @@ +@@ -115,30 +159,14 @@ adjust_column (size_t column, char c) to stdout, with maximum line length WIDTH. Return true if successful. */ @@ -939,13 +916,13 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c - - if (istream == NULL) - { -- error (0, errno, "%s", filename); +- error (0, errno, "%s", quotef (filename)); - return false; - } fadvise (istream, FADVISE_SEQUENTIAL); -@@ -169,6 +197,15 @@ +@@ -168,6 +196,15 @@ fold_file (char const *filename, size_t bool found_blank = false; size_t logical_end = offset_out; @@ -961,7 +938,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c /* Look for the last blank. */ while (logical_end) { -@@ -215,11 +252,221 @@ +@@ -214,11 +251,221 @@ fold_file (char const *filename, size_t line_out[offset_out++] = c; } @@ -1072,7 +1049,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c + fwrite (line_out, sizeof(char), offset_out, stdout); + START_NEW_LINE; + continue; -+ ++ + case L'\b': + increment = (column > 0) ? -1 : 0; + break; @@ -1169,7 +1146,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c + + if (istream == NULL) + { -+ error (0, errno, "%s", filename); ++ error (0, errno, "%s", quotef (filename)); + return 1; + } + @@ -1183,8 +1160,8 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c + if (ferror (istream)) { - error (0, saved_errno, "%s", filename); -@@ -252,7 +499,8 @@ + error (0, saved_errno, "%s", quotef (filename)); +@@ -251,7 +498,8 @@ main (int argc, char **argv) atexit (close_stdout); @@ -1194,7 +1171,7 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) { -@@ -261,7 +509,15 @@ +@@ -260,7 +508,15 @@ main (int argc, char **argv) switch (optc) { case 'b': /* Count bytes rather than columns. */ @@ -1211,9 +1188,9 @@ diff -Naur coreutils-8.23.orig/src/fold.c coreutils-8.23/src/fold.c break; case 's': /* Break at word boundaries. */ -diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c ---- coreutils-8.23.orig/src/join.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/join.c 2014-07-18 22:36:17.394067191 -0500 +diff -Naurp coreutils-8.25-orig/src/join.c coreutils-8.25/src/join.c +--- coreutils-8.25-orig/src/join.c 2016-01-13 05:08:59.000000000 -0600 ++++ coreutils-8.25/src/join.c 2016-02-08 19:07:10.303944625 -0600 @@ -22,18 +22,32 @@ #include <sys/types.h> #include <getopt.h> @@ -1248,7 +1225,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "join" -@@ -135,10 +149,12 @@ +@@ -135,10 +149,12 @@ static struct outlist outlist_head; /* Last element in 'outlist', where a new element can be added. */ static struct outlist *outlist_end = &outlist_head; @@ -1265,7 +1242,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c /* If nonzero, check that the input is correctly ordered. */ static enum -@@ -269,13 +285,14 @@ +@@ -275,13 +291,14 @@ xfields (struct line *line) if (ptr == lim) return; @@ -1282,8 +1259,8 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c + else { /* Skip leading blanks before the first field. */ - while (isblank (to_uchar (*ptr))) -@@ -299,6 +316,147 @@ + while (field_sep (*ptr)) +@@ -305,6 +322,147 @@ xfields (struct line *line) extract_field (line, ptr, lim - ptr); } @@ -1351,7 +1328,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c + } + mblength = (mblength < 1) ? 1 : mblength; + -+ if (!iswblank(wc)) ++ if (!iswblank(wc) && wc != '\n') + break; + ptr += mblength; + } @@ -1382,7 +1359,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c + } + mblength = (mblength < 1) ? 1 : mblength; + -+ if (iswblank (wc)) ++ if (iswblank (wc) || wc == '\n') + break; + + sep += mblength; @@ -1415,7 +1392,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c + } + mblength = (mblength < 1) ? 1 : mblength; + -+ if (!iswblank (wc)) ++ if (!iswblank (wc) && wc != '\n') + break; + + ptr += mblength; @@ -1427,11 +1404,11 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c + extract_field (line, ptr, lim - ptr); +} +#endif -+ ++ static void freeline (struct line *line) { -@@ -320,56 +478,133 @@ +@@ -326,56 +484,133 @@ keycmp (struct line const *line1, struct size_t jf_1, size_t jf_2) { /* Start of field to compare in each file. */ @@ -1588,7 +1565,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c } /* Check that successive input lines PREV and CURRENT from input file -@@ -461,6 +696,11 @@ +@@ -467,6 +702,11 @@ get_line (FILE *fp, struct line **linep, } ++line_no[which - 1]; @@ -1600,7 +1577,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c xfields (line); if (prevline[which - 1]) -@@ -560,21 +800,28 @@ +@@ -566,21 +806,28 @@ prfield (size_t n, struct line const *li /* Output all the fields in line, other than the join field. */ @@ -1632,7 +1609,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c prfield (i, line); } } -@@ -585,7 +832,6 @@ +@@ -591,7 +838,6 @@ static void prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -1640,7 +1617,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c size_t field; struct line const *line; -@@ -619,7 +865,7 @@ +@@ -625,7 +871,7 @@ prjoin (struct line const *line1, struct o = o->next; if (o == NULL) break; @@ -1649,7 +1626,7 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c } putchar (eolchar); } -@@ -1097,21 +1343,46 @@ +@@ -1103,21 +1349,46 @@ main (int argc, char **argv) case 't': { @@ -1706,10 +1683,10 @@ diff -Naur coreutils-8.23.orig/src/join.c coreutils-8.23/src/join.c break; case 'z': -diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c ---- coreutils-8.23.orig/src/pr.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/pr.c 2014-07-18 22:36:17.395067159 -0500 -@@ -312,6 +312,24 @@ +diff -Naurp coreutils-8.25-orig/src/pr.c coreutils-8.25/src/pr.c +--- coreutils-8.25-orig/src/pr.c 2016-01-01 07:48:50.000000000 -0600 ++++ coreutils-8.25/src/pr.c 2016-02-08 19:07:10.306944635 -0600 +@@ -311,6 +311,24 @@ #include <getopt.h> #include <sys/types.h> @@ -1735,8 +1712,8 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c #include "error.h" #include "fadvise.h" @@ -323,6 +341,18 @@ - #include "strftime.h" #include "xstrtol.h" + #include "xdectoint.h" +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ +#if HAVE_MBRTOWC && defined mbstate_t @@ -1753,7 +1730,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "pr" -@@ -415,7 +445,20 @@ +@@ -415,7 +445,20 @@ struct COLUMN typedef struct COLUMN COLUMN; @@ -1775,23 +1752,23 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c static bool read_line (COLUMN *p); static bool print_page (void); static bool print_stored (COLUMN *p); -@@ -425,6 +468,7 @@ - static void pad_across_to (int position); - static void add_line_number (COLUMN *p); +@@ -427,6 +470,7 @@ static void add_line_number (COLUMN *p); + static void getoptnum (const char *n_str, int min, int *num, + const char *errfmt); static void getoptarg (char *arg, char switch_char, char *character, + int *character_length, int *character_width, int *number); static void print_files (int number_of_files, char **av); static void init_parameters (int number_of_files); -@@ -438,7 +482,6 @@ - static void pad_down (int lines); +@@ -440,7 +484,6 @@ static void store_char (char c); + static void pad_down (unsigned int lines); static void read_rest_of_line (COLUMN *p); static void skip_read (COLUMN *p, int column_number); -static void print_char (char c); static void cleanup (void); static void print_sep_string (void); static void separator_string (const char *optarg_S); -@@ -450,7 +493,7 @@ +@@ -452,7 +495,7 @@ static COLUMN *column_vector; we store the leftmost columns contiguously in buff. To print a line from buff, get the index of the first character from line_vector[i], and print up to line_vector[i + 1]. */ @@ -1800,7 +1777,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* Index of the position in buff where the next character will be stored. */ -@@ -554,7 +597,7 @@ +@@ -556,7 +599,7 @@ static int chars_per_column; static bool untabify_input = false; /* (-e) The input tab character. */ @@ -1809,7 +1786,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ... where the leftmost column is 1. */ -@@ -564,7 +607,10 @@ +@@ -566,7 +609,10 @@ static int chars_per_input_tab = 8; static bool tabify_output = false; /* (-i) The output tab character. */ @@ -1821,7 +1798,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* (-i) The width of the output tab. */ static int chars_per_output_tab = 8; -@@ -634,7 +680,13 @@ +@@ -636,7 +682,13 @@ static int line_number; static bool numbered_lines = false; /* (-n) Character which follows each line number. */ @@ -1836,7 +1813,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* (-n) line counting starts with 1st line of input file (not with 1st line of 1st page printed). */ -@@ -687,6 +739,7 @@ +@@ -689,6 +741,7 @@ static bool use_col_separator = false; -a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */ static char *col_sep_string = (char *) ""; static int col_sep_length = 0; @@ -1844,7 +1821,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c static char *column_separator = (char *) " "; static char *line_separator = (char *) "\t"; -@@ -843,6 +896,13 @@ +@@ -839,6 +892,13 @@ separator_string (const char *optarg_S) col_sep_length = (int) strlen (optarg_S); col_sep_string = xmalloc (col_sep_length + 1); strcpy (col_sep_string, optarg_S); @@ -1858,7 +1835,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c } int -@@ -867,6 +927,21 @@ +@@ -863,6 +923,21 @@ main (int argc, char **argv) atexit (close_stdout); @@ -1880,7 +1857,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c n_files = 0; file_names = (argc > 1 ? xmalloc ((argc - 1) * sizeof (char *)) -@@ -943,8 +1018,12 @@ +@@ -939,8 +1014,12 @@ main (int argc, char **argv) break; case 'e': if (optarg) @@ -1895,7 +1872,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* Could check tab width > 0. */ untabify_input = true; break; -@@ -957,8 +1036,12 @@ +@@ -953,8 +1032,12 @@ main (int argc, char **argv) break; case 'i': if (optarg) @@ -1910,7 +1887,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* Could check tab width > 0. */ tabify_output = true; break; -@@ -985,8 +1068,8 @@ +@@ -972,8 +1055,8 @@ main (int argc, char **argv) case 'n': numbered_lines = true; if (optarg) @@ -1921,7 +1898,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c break; case 'N': skip_count = false; -@@ -1025,7 +1108,7 @@ +@@ -997,7 +1080,7 @@ main (int argc, char **argv) old_s = false; /* Reset an additional input of -s, -S dominates -s */ col_sep_string = bad_cast (""); @@ -1930,7 +1907,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c use_col_separator = true; if (optarg) separator_string (optarg); -@@ -1182,10 +1265,45 @@ +@@ -1152,10 +1235,45 @@ getoptnum (const char *n_str, int min, i a number. */ static void @@ -1978,7 +1955,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c if (*arg) { long int tmp_long; -@@ -1207,6 +1325,11 @@ +@@ -1177,6 +1295,11 @@ static void init_parameters (int number_of_files) { int chars_used_by_number = 0; @@ -1990,7 +1967,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c lines_per_body = lines_per_page - lines_per_header - lines_per_footer; if (lines_per_body <= 0) -@@ -1244,7 +1367,7 @@ +@@ -1214,7 +1337,7 @@ init_parameters (int number_of_files) else col_sep_string = column_separator; @@ -1999,7 +1976,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c use_col_separator = true; } /* It's rather pointless to define a TAB separator with column -@@ -1274,11 +1397,11 @@ +@@ -1244,11 +1367,11 @@ init_parameters (int number_of_files) + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ /* Estimate chars_per_text without any margin and keep it constant. */ @@ -2013,7 +1990,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* The number is part of the column width unless we are printing files in parallel. */ -@@ -1287,7 +1410,7 @@ +@@ -1257,7 +1380,7 @@ init_parameters (int number_of_files) } chars_per_column = (chars_per_line - chars_used_by_number @@ -2022,16 +1999,16 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c if (chars_per_column < 1) error (EXIT_FAILURE, 0, _("page width too narrow")); -@@ -1305,7 +1428,7 @@ +@@ -1275,7 +1398,7 @@ init_parameters (int number_of_files) We've to use 8 as the lower limit, if we use chars_per_default_tab = 8 to expand a tab which is not an input_tab-char. */ free (clump_buff); - clump_buff = xmalloc (MAX (8, chars_per_input_tab)); + clump_buff = xmalloc (mb_len * MAX (8, chars_per_input_tab)); } - + /* Open the necessary files, -@@ -1413,7 +1536,7 @@ +@@ -1383,7 +1506,7 @@ init_funcs (void) /* Enlarge p->start_position of first column to use the same form of padding_not_printed with all columns. */ @@ -2040,7 +2017,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* This loop takes care of all but the rightmost column. */ -@@ -1447,7 +1570,7 @@ +@@ -1417,7 +1540,7 @@ init_funcs (void) } else { @@ -2049,7 +2026,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c h_next = h + chars_per_column; } } -@@ -1738,9 +1861,9 @@ +@@ -1708,9 +1831,9 @@ static void align_column (COLUMN *p) { padding_not_printed = p->start_position; @@ -2061,7 +2038,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c padding_not_printed = ANYWHERE; } -@@ -2011,13 +2134,13 @@ +@@ -1981,13 +2104,13 @@ store_char (char c) /* May be too generous. */ buff = X2REALLOC (buff, &buff_allocated); } @@ -2077,7 +2054,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c char *s; int num_width; -@@ -2034,22 +2157,24 @@ +@@ -2004,22 +2127,24 @@ add_line_number (COLUMN *p) /* Tabification is assumed for multiple columns, also for n-separators, but 'default n-separator = TAB' hasn't been given priority over equal column_width also specified by POSIX. */ @@ -2106,7 +2083,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c output_position = POS_AFTER_TAB (chars_per_output_tab, output_position); } -@@ -2210,7 +2335,7 @@ +@@ -2180,7 +2305,7 @@ print_white_space (void) while (goal - h_old > 1 && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) { @@ -2115,7 +2092,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c h_old = h_new; } while (++h_old <= goal) -@@ -2230,6 +2355,7 @@ +@@ -2200,6 +2325,7 @@ print_sep_string (void) { char *s; int l = col_sep_length; @@ -2123,7 +2100,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c s = col_sep_string; -@@ -2243,6 +2369,7 @@ +@@ -2213,6 +2339,7 @@ print_sep_string (void) { for (; separators_not_printed > 0; --separators_not_printed) { @@ -2131,7 +2108,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c while (l-- > 0) { /* 3 types of sep_strings: spaces only, spaces and chars, -@@ -2256,12 +2383,15 @@ +@@ -2226,12 +2353,15 @@ print_sep_string (void) } else { @@ -2148,7 +2125,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* sep_string ends with some spaces */ if (spaces_not_printed > 0) print_white_space (); -@@ -2289,7 +2419,7 @@ +@@ -2259,7 +2389,7 @@ print_clump (COLUMN *p, int n, char *clu required number of tabs and spaces. */ static void @@ -2157,7 +2134,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c { if (tabify_output) { -@@ -2313,6 +2443,74 @@ +@@ -2283,6 +2413,74 @@ print_char (char c) putchar (c); } @@ -2232,7 +2209,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* Skip to page PAGE before printing. PAGE may be larger than total number of pages. */ -@@ -2492,9 +2690,9 @@ +@@ -2462,9 +2660,9 @@ read_line (COLUMN *p) align_empty_cols = false; } @@ -2244,7 +2221,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c padding_not_printed = ANYWHERE; } -@@ -2564,7 +2762,7 @@ +@@ -2534,7 +2732,7 @@ print_stored (COLUMN *p) int i; int line = p->current_line++; @@ -2253,7 +2230,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* FIXME UMR: Uninitialized memory read: * This is occurring while in: -@@ -2576,7 +2774,7 @@ +@@ -2546,7 +2744,7 @@ print_stored (COLUMN *p) xmalloc [xmalloc.c:94] init_store_cols [pr.c:1648] */ @@ -2262,7 +2239,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c pad_vertically = true; -@@ -2595,9 +2793,9 @@ +@@ -2565,9 +2763,9 @@ print_stored (COLUMN *p) } } @@ -2274,7 +2251,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c padding_not_printed = ANYWHERE; } -@@ -2610,8 +2808,8 @@ +@@ -2580,8 +2778,8 @@ print_stored (COLUMN *p) if (spaces_not_printed == 0) { output_position = p->start_position + end_vector[line]; @@ -2285,7 +2262,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c } return true; -@@ -2630,7 +2828,7 @@ +@@ -2600,7 +2798,7 @@ print_stored (COLUMN *p) number of characters is 1.) */ static int @@ -2294,7 +2271,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c { unsigned char uc = c; char *s = clump_buff; -@@ -2640,10 +2838,10 @@ +@@ -2610,10 +2808,10 @@ char_to_clump (char c) int chars; int chars_per_c = 8; @@ -2307,7 +2284,7 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c { width = TAB_WIDTH (chars_per_c, input_position); -@@ -2724,6 +2922,164 @@ +@@ -2694,6 +2892,164 @@ char_to_clump (char c) return chars; } @@ -2472,9 +2449,9 @@ diff -Naur coreutils-8.23.orig/src/pr.c coreutils-8.23/src/pr.c /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files. -diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c ---- coreutils-8.23.orig/src/sort.c 2014-07-13 17:09:52.000000000 -0500 -+++ coreutils-8.23/src/sort.c 2014-07-18 22:36:17.397067101 -0500 +diff -Naurp coreutils-8.25-orig/src/sort.c coreutils-8.25/src/sort.c +--- coreutils-8.25-orig/src/sort.c 2016-01-16 13:09:33.000000000 -0600 ++++ coreutils-8.25/src/sort.c 2016-02-08 19:07:10.310944648 -0600 @@ -29,6 +29,14 @@ #include <sys/wait.h> #include <signal.h> @@ -2490,7 +2467,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c #include "system.h" #include "argmatch.h" #include "error.h" -@@ -164,14 +172,39 @@ +@@ -163,14 +171,39 @@ static int decimal_point; /* Thousands separator; if -1, then there isn't one. */ static int thousands_sep; @@ -2531,7 +2508,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -345,13 +378,11 @@ +@@ -344,13 +377,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -2548,7 +2525,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -811,6 +842,46 @@ +@@ -810,6 +841,46 @@ reap_all (void) reap (-1); } @@ -2588,14 +2565,14 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + } + + *length = (mblength < 1) ? 1 : mblength; -+ return iswblank (wc); ++ return iswblank (wc) || wc == '\n'; +} +#endif + /* Clean up any remaining temporary files. */ static void -@@ -1255,7 +1326,7 @@ +@@ -1254,7 +1325,7 @@ zaptemp (char const *name) free (node); } @@ -2604,7 +2581,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c static int struct_month_cmp (void const *m1, void const *m2) -@@ -1270,7 +1341,7 @@ +@@ -1269,7 +1340,7 @@ struct_month_cmp (void const *m1, void c /* Initialize the character class tables. */ static void @@ -2613,7 +2590,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { size_t i; -@@ -1282,7 +1353,7 @@ +@@ -1281,7 +1352,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -2622,7 +2599,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1364,6 +1435,84 @@ +@@ -1363,6 +1434,84 @@ specify_nmerge (int oi, char c, char con xstrtol_fatal (e, oi, c, long_options, s); } @@ -2707,7 +2684,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1597,7 +1746,7 @@ +@@ -1596,7 +1745,7 @@ buffer_linelim (struct buffer const *buf by KEY in LINE. */ static char * @@ -2716,7 +2693,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1606,10 +1755,10 @@ +@@ -1605,10 +1754,10 @@ begfield (struct line const *line, struc /* The leading field separator itself is included in a field when -t is absent. */ @@ -2729,7 +2706,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c ++ptr; if (ptr < lim) ++ptr; -@@ -1635,11 +1784,70 @@ +@@ -1634,11 +1783,70 @@ begfield (struct line const *line, struc return ptr; } @@ -2801,7 +2778,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1654,10 +1862,10 @@ +@@ -1653,10 +1861,10 @@ limfield (struct line const *line, struc 'beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first 'blank' character after the preceding field. */ @@ -2814,7 +2791,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1703,10 +1911,10 @@ +@@ -1702,10 +1910,10 @@ limfield (struct line const *line, struc */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2827,7 +2804,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c if (newlim) lim = newlim; } -@@ -1737,6 +1945,130 @@ +@@ -1736,6 +1944,130 @@ limfield (struct line const *line, struc return ptr; } @@ -2958,7 +2935,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1823,8 +2155,22 @@ +@@ -1822,8 +2154,22 @@ fillbuf (struct buffer *buf, FILE *fp, c else { if (key->skipsblanks) @@ -2983,7 +2960,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c line->keybeg = line_start; } } -@@ -1945,7 +2291,7 @@ +@@ -1944,7 +2290,7 @@ human_numcompare (char const *a, char co hideously fast. */ static int @@ -2992,7 +2969,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { while (blanks[to_uchar (*a)]) a++; -@@ -1955,6 +2301,25 @@ +@@ -1954,6 +2300,25 @@ numcompare (char const *a, char const *b return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -3018,7 +2995,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* Work around a problem whereby the long double value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: clear all bytes of A and B before calling strtold. FIXME: remove this function once -@@ -2005,7 +2370,7 @@ +@@ -2004,7 +2369,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */ static int @@ -3027,7 +3004,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2280,15 +2645,14 @@ +@@ -2280,15 +2645,14 @@ debug_key (struct line const *line, stru char saved = *lim; *lim = '\0'; @@ -3045,7 +3022,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2432,7 +2796,7 @@ +@@ -2432,7 +2796,7 @@ key_warnings (struct keyfield const *gke bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -3054,7 +3031,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2490,11 +2854,87 @@ +@@ -2490,11 +2854,87 @@ key_warnings (struct keyfield const *gke error (0, 0, _("option '-r' only applies to last-resort comparison")); } @@ -3067,8 +3044,8 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + register int lo = 0, hi = MONTHS_PER_YEAR, result; + char *tmp; + size_t wclength, mblength; -+ const char **pp; -+ const wchar_t **wpp; ++ const char *pp; ++ const wchar_t *wpp; + wchar_t *month_wcs; + mbstate_t state; + @@ -3081,17 +3058,19 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + if (len == 0) + return 0; + -+ month = (char *) xmalloc (len + 1); ++ if (SIZE_MAX - len < 1) ++ xalloc_die (); ++ ++ month = (char *) xnmalloc (len + 1, MB_CUR_MAX); + -+ tmp = (char *) xmalloc (len + 1); ++ pp = tmp = (char *) xnmalloc (len + 1, MB_CUR_MAX); + memcpy (tmp, s, len); + tmp[len] = '\0'; -+ pp = (const char **)&tmp; -+ month_wcs = (wchar_t *) xmalloc ((len + 1) * sizeof (wchar_t)); -+ memset (&state, '\0', sizeof(mbstate_t)); ++ wpp = month_wcs = (wchar_t *) xnmalloc (len + 1, sizeof (wchar_t)); ++ memset (&state, '\0', sizeof (mbstate_t)); + -+ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state); -+ if (wclength == (size_t)-1 || *pp != NULL) ++ wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state); ++ if (wclength == (size_t)-1 || pp != NULL) + error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s)); + + for (i = 0; i < wclength; i++) @@ -3104,10 +3083,8 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + } + } + -+ wpp = (const wchar_t **)&month_wcs; -+ -+ mblength = wcsrtombs (month, wpp, len + 1, &state); -+ assert (mblength != (-1) && *wpp == NULL); ++ mblength = wcsrtombs (month, &wpp, (len + 1) * MB_CUR_MAX, &state); ++ assert (mblength != (-1) && wpp == NULL); + + do + { @@ -3143,7 +3120,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { struct keyfield *key = keylist; -@@ -2579,7 +3019,7 @@ +@@ -2579,7 +3019,7 @@ keycompare (struct line const *a, struct else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -3152,7 +3129,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2695,6 +3135,191 @@ +@@ -2695,6 +3135,211 @@ keycompare (struct line const *a, struct return key->reverse ? -diff : diff; } @@ -3257,13 +3234,18 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + size_t lena = lima <= texta ? 0 : lima - texta; + size_t lenb = limb <= textb ? 0 : limb - textb; + ++ char enda IF_LINT (= 0); ++ char endb IF_LINT (= 0); ++ + char const *translate = key->translate; + bool const *ignore = key->ignore; + + if (ignore || translate) + { -+ char *copy_a = (char *) xmalloc (lena + 1 + lenb + 1); -+ char *copy_b = copy_a + lena + 1; ++ if (SIZE_MAX - lenb - 2 < lena) ++ xalloc_die (); ++ char *copy_a = (char *) xnmalloc (lena + lenb + 2, MB_CUR_MAX); ++ char *copy_b = copy_a + lena * MB_CUR_MAX + 1; + size_t new_len_a, new_len_b; + size_t i, j; + @@ -3274,6 +3256,12 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + texta = copy_a; textb = copy_b; + lena = new_len_a; lenb = new_len_b; + } ++ else ++ { ++ /* Use the keys in-place, temporarily null-terminated. */ ++ enda = texta[lena]; texta[lena] = '\0'; ++ endb = textb[lenb]; textb[lenb] = '\0'; ++ } + + if (key->random) + diff = compare_random (texta, lena, textb, lenb); @@ -3297,13 +3285,22 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c + diff = 1; + else if (hard_LC_COLLATE && !folding) + { -+ diff = xmemcoll0 (texta, lena, textb, lenb); ++ diff = xmemcoll0 (texta, lena + 1, textb, lenb + 1); + } + else -+ diff = memcmp (texta, textb, MIN (lena + 1,lenb + 1)); ++ { ++ diff = memcmp (texta, textb, MIN (lena, lenb)); ++ if (diff == 0) ++ diff = lena < lenb ? -1 : lena != lenb; ++ } + + if (ignore || translate) + free (texta); ++ else ++ { ++ texta[lena] = enda; ++ textb[lenb] = endb; ++ } + + if (diff) + goto not_equal; @@ -3344,7 +3341,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2722,7 +3347,7 @@ +@@ -2722,7 +3367,7 @@ compare (struct line const *a, struct li diff = - NONZERO (blen); else if (blen == 0) diff = 1; @@ -3353,7 +3350,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c { /* Note xmemcoll0 is a performance enhancement as it will not unconditionally write '\0' after the -@@ -4121,6 +4746,7 @@ +@@ -4121,6 +4766,7 @@ set_ordering (char const *s, struct keyf break; case 'f': key->translate = fold_toupper; @@ -3361,7 +3358,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c break; case 'g': key->general_numeric = true; -@@ -4198,7 +4824,7 @@ +@@ -4199,7 +4845,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3370,7 +3367,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4219,6 +4845,29 @@ +@@ -4220,6 +4866,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -3400,7 +3397,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c have_read_stdin = false; inittables (); -@@ -4493,13 +5142,34 @@ +@@ -4494,13 +5163,34 @@ main (int argc, char **argv) case 't': { @@ -3439,7 +3436,7 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c else { /* Provoke with 'sort -txx'. Complain about -@@ -4510,9 +5180,12 @@ +@@ -4511,9 +5201,12 @@ main (int argc, char **argv) quote (optarg)); } } @@ -3454,9 +3451,22 @@ diff -Naur coreutils-8.23.orig/src/sort.c coreutils-8.23/src/sort.c } break; -diff -Naur coreutils-8.23.orig/src/unexpand.c coreutils-8.23/src/unexpand.c ---- coreutils-8.23.orig/src/unexpand.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/unexpand.c 2014-07-18 22:36:17.397067101 -0500 +@@ -4751,12 +5444,10 @@ main (int argc, char **argv) + sort (files, nfiles, outfile, nthreads); + } + +-#ifdef lint + if (files_from) + readtokens0_free (&tok); + else + free (files); +-#endif + + if (have_read_stdin && fclose (stdin) == EOF) + die (_("close failed"), "-"); +diff -Naurp coreutils-8.25-orig/src/unexpand.c coreutils-8.25/src/unexpand.c +--- coreutils-8.25-orig/src/unexpand.c 2016-01-01 07:48:50.000000000 -0600 ++++ coreutils-8.25/src/unexpand.c 2016-02-08 19:07:10.311944651 -0600 @@ -38,12 +38,29 @@ #include <stdio.h> #include <getopt.h> @@ -3487,7 +3497,7 @@ diff -Naur coreutils-8.23.orig/src/unexpand.c coreutils-8.23/src/unexpand.c /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "unexpand" -@@ -103,6 +120,210 @@ +@@ -103,6 +120,210 @@ static struct option const longopts[] = {NULL, 0, NULL, 0} }; @@ -3698,7 +3708,7 @@ diff -Naur coreutils-8.23.orig/src/unexpand.c coreutils-8.23/src/unexpand.c void usage (int status) { -@@ -523,7 +744,12 @@ +@@ -523,7 +744,12 @@ main (int argc, char **argv) file_list = (optind < argc ? &argv[optind] : stdin_argv); @@ -3712,9 +3722,9 @@ diff -Naur coreutils-8.23.orig/src/unexpand.c coreutils-8.23/src/unexpand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c ---- coreutils-8.23.orig/src/uniq.c 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/src/uniq.c 2014-07-18 22:36:17.398067074 -0500 +diff -Naurp coreutils-8.25-orig/src/uniq.c coreutils-8.25/src/uniq.c +--- coreutils-8.25-orig/src/uniq.c 2016-01-13 05:08:59.000000000 -0600 ++++ coreutils-8.25/src/uniq.c 2016-02-08 19:07:10.312944654 -0600 @@ -21,6 +21,17 @@ #include <getopt.h> #include <sys/types.h> @@ -3733,11 +3743,10 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c #include "system.h" #include "argmatch.h" #include "linebuffer.h" -@@ -32,7 +43,19 @@ - #include "stdio--.h" - #include "xmemcoll.h" +@@ -33,6 +44,18 @@ #include "xstrtol.h" --#include "memcasecmp.h" + #include "memcasecmp.h" + #include "quote.h" +#include "xmemcoll.h" + +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC @@ -3750,11 +3759,10 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c +#if HAVE_MBRTOWC && defined mbstate_t +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) +#endif -+ /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "uniq" -@@ -143,6 +166,10 @@ +@@ -143,6 +166,10 @@ enum GROUP_OPTION = CHAR_MAX + 1 }; @@ -3765,7 +3773,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c static struct option const longopts[] = { {"count", no_argument, NULL, 'c'}, -@@ -251,7 +278,7 @@ +@@ -252,7 +279,7 @@ size_opt (char const *opt, char const *m return a pointer to the beginning of the line's field to be compared. */ static char * _GL_ATTRIBUTE_PURE @@ -3774,7 +3782,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c { size_t count; char const *lp = line->buffer; -@@ -271,6 +298,83 @@ +@@ -272,6 +299,83 @@ find_field (struct linebuffer const *lin return line->buffer + i; } @@ -3824,8 +3832,8 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c + while (pos < size) + { + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ -+ if (convfail || !iswblank (wc)) ++ ++ if (convfail || !(iswblank (wc) || wc == '\n')) + { + pos += mblength; + break; @@ -3837,7 +3845,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c + { + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); + -+ if (!convfail && iswblank (wc)) ++ if (!convfail && (iswblank (wc) || wc == '\n')) + break; + + pos += mblength; @@ -3858,7 +3866,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c /* Return false if two strings OLD and NEW match, true if not. OLD and NEW point not to the beginnings of the lines but rather to the beginnings of the fields to compare. -@@ -279,6 +383,8 @@ +@@ -280,6 +384,8 @@ find_field (struct linebuffer const *lin static bool different (char *old, char *new, size_t oldlen, size_t newlen) { @@ -3867,7 +3875,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c if (check_chars < oldlen) oldlen = check_chars; if (check_chars < newlen) -@@ -286,15 +392,104 @@ +@@ -287,15 +393,104 @@ different (char *old, char *new, size_t if (ignore_case) { @@ -3977,7 +3985,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c /* Output the line in linebuffer LINE to standard output provided that the switches say it should be output. MATCH is true if the line matches the previous line. -@@ -358,19 +553,38 @@ +@@ -359,19 +554,38 @@ check_file (const char *infile, const ch char *prevfield IF_LINT ( = NULL); size_t prevlen IF_LINT ( = 0); bool first_group_printed = false; @@ -4016,7 +4024,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c new_group = (prevline->length == 0 || different (thisfield, prevfield, thislen, prevlen)); -@@ -388,6 +602,10 @@ +@@ -389,6 +603,10 @@ check_file (const char *infile, const ch SWAP_LINES (prevline, thisline); prevfield = thisfield; prevlen = thislen; @@ -4027,7 +4035,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c first_group_printed = true; } } -@@ -400,17 +618,26 @@ +@@ -401,17 +619,26 @@ check_file (const char *infile, const ch size_t prevlen; uintmax_t match_count = 0; bool first_delimiter = true; @@ -4054,7 +4062,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) { if (ferror (stdin)) -@@ -419,6 +646,14 @@ +@@ -420,6 +647,14 @@ check_file (const char *infile, const ch } thisfield = find_field (thisline); thislen = thisline->length - 1 - (thisfield - thisline->buffer); @@ -4069,7 +4077,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c match = !different (thisfield, prevfield, thislen, prevlen); match_count += match; -@@ -451,6 +686,9 @@ +@@ -452,6 +687,9 @@ check_file (const char *infile, const ch SWAP_LINES (prevline, thisline); prevfield = thisfield; prevlen = thislen; @@ -4079,7 +4087,7 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c if (!match) match_count = 0; } -@@ -497,6 +735,19 @@ +@@ -498,6 +736,19 @@ main (int argc, char **argv) atexit (close_stdout); @@ -4099,21 +4107,94 @@ diff -Naur coreutils-8.23.orig/src/uniq.c coreutils-8.23/src/uniq.c skip_chars = 0; skip_fields = 0; check_chars = SIZE_MAX; -diff -Naur coreutils-8.23.orig/tests/local.mk coreutils-8.23/tests/local.mk ---- coreutils-8.23.orig/tests/local.mk 2014-07-13 17:09:52.000000000 -0500 -+++ coreutils-8.23/tests/local.mk 2014-07-18 22:36:17.398067074 -0500 -@@ -331,6 +331,7 @@ +diff -Naurp coreutils-8.25-orig/tests/i18n/sort-month.sh coreutils-8.25/tests/i18n/sort-month.sh +--- coreutils-8.25-orig/tests/i18n/sort-month.sh 1969-12-31 18:00:00.000000000 -0600 ++++ coreutils-8.25/tests/i18n/sort-month.sh 2016-02-08 19:07:10.312944654 -0600 +@@ -0,0 +1,34 @@ ++#!/bin/sh ++# Verify sort -M multi-byte support. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ sort ++require_valgrind_ ++ ++# Skip this test if some deallocations are ++# avoided at process end. ++grep '^#define lint 1' $CONFIG_HEADER > /dev/null || ++ skip_ 'Allocation checks only work reliably in "lint" mode' ++ ++export LC_ALL=en_US.UTF-8 ++locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ ++ || skip_ "No UTF-8 locale available" ++ ++# Note the use of ɑ here which expands to ++# a wider representation upon case conversion ++# which triggered an assertion in sort -M ++cat <<EOF > exp ++. ++ɑ ++EOF ++ ++ ++# check large mem leak with --month-sort ++# https://bugzilla.redhat.com/show_bug.cgi?id=1259942 ++valgrind --leak-check=full \ ++ --error-exitcode=1 --errors-for-leak-kinds=definite \ ++ sort -M < exp > out || fail=1 ++compare exp out || { fail=1; cat out; } ++ ++ ++Exit $fail +diff -Naurp coreutils-8.25-orig/tests/i18n/sort.sh coreutils-8.25/tests/i18n/sort.sh +--- coreutils-8.25-orig/tests/i18n/sort.sh 1969-12-31 18:00:00.000000000 -0600 ++++ coreutils-8.25/tests/i18n/sort.sh 2016-02-08 19:07:10.312944654 -0600 +@@ -0,0 +1,29 @@ ++#!/bin/sh ++# Verify sort's multi-byte support. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ sort ++ ++export LC_ALL=en_US.UTF-8 ++locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ ++ || skip_ "No UTF-8 locale available" ++ ++# Enable heap consistency checkng on older systems ++export MALLOC_CHECK_=2 ++ ++ ++# check buffer overflow issue due to ++# expanding multi-byte representation due to case conversion ++# https://bugzilla.suse.com/show_bug.cgi?id=928749 ++cat <<EOF > exp ++. ++ɑ ++EOF ++cat <<EOF | sort -f > out || fail=1 ++. ++ɑ ++EOF ++compare exp out || { fail=1; cat out; } ++ ++ ++Exit $fail +diff -Naurp coreutils-8.25-orig/tests/local.mk coreutils-8.25/tests/local.mk +--- coreutils-8.25-orig/tests/local.mk 2016-01-16 12:18:13.000000000 -0600 ++++ coreutils-8.25/tests/local.mk 2016-02-08 19:07:10.313944658 -0600 +@@ -344,6 +344,9 @@ all_tests = \ tests/misc/sort-discrim.sh \ tests/misc/sort-files0-from.pl \ tests/misc/sort-float.sh \ + tests/misc/sort-mb-tests.sh \ ++ tests/i18n/sort.sh \ ++ tests/i18n/sort-month.sh \ tests/misc/sort-merge.pl \ tests/misc/sort-merge-fdlimit.sh \ tests/misc/sort-month.sh \ -diff -Naur coreutils-8.23.orig/tests/misc/cut.pl coreutils-8.23/tests/misc/cut.pl ---- coreutils-8.23.orig/tests/misc/cut.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/cut.pl 2014-07-18 22:36:17.398067074 -0500 -@@ -23,9 +23,11 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/cut.pl coreutils-8.25/tests/misc/cut.pl +--- coreutils-8.25-orig/tests/misc/cut.pl 2016-01-16 12:18:13.000000000 -0600 ++++ coreutils-8.25/tests/misc/cut.pl 2016-02-08 19:07:10.314944661 -0600 +@@ -23,9 +23,11 @@ use strict; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -4127,7 +4208,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/cut.pl coreutils-8.23/tests/misc/cut.p my $prog = 'cut'; my $try = "Try '$prog --help' for more information.\n"; -@@ -227,6 +229,7 @@ +@@ -240,6 +242,7 @@ if ($mb_locale ne 'C') my @new_t = @$t; my $test_name = shift @new_t; @@ -4135,10 +4216,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/cut.pl coreutils-8.23/tests/misc/cut.p push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; } push @Tests, @new; -diff -Naur coreutils-8.23.orig/tests/misc/expand.pl coreutils-8.23/tests/misc/expand.pl ---- coreutils-8.23.orig/tests/misc/expand.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/expand.pl 2014-07-18 22:36:17.399067050 -0500 -@@ -23,6 +23,15 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/expand.pl coreutils-8.25/tests/misc/expand.pl +--- coreutils-8.25-orig/tests/misc/expand.pl 2016-01-16 12:18:13.000000000 -0600 ++++ coreutils-8.25/tests/misc/expand.pl 2016-02-08 19:07:10.314944661 -0600 +@@ -23,6 +23,15 @@ use strict; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -4154,7 +4235,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/expand.pl coreutils-8.23/tests/misc/ex my @Tests = ( ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], -@@ -31,6 +40,37 @@ +@@ -31,6 +40,37 @@ my @Tests = ['i2', '--tabs=3 -i', {IN=>" \ta\tb"}, {OUT=>" a\tb"}], ); @@ -4192,10 +4273,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/expand.pl coreutils-8.23/tests/misc/ex my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -diff -Naur coreutils-8.23.orig/tests/misc/fold.pl coreutils-8.23/tests/misc/fold.pl ---- coreutils-8.23.orig/tests/misc/fold.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/fold.pl 2014-07-18 22:36:17.399067050 -0500 -@@ -20,9 +20,18 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/fold.pl coreutils-8.25/tests/misc/fold.pl +--- coreutils-8.25-orig/tests/misc/fold.pl 2016-01-16 12:18:13.000000000 -0600 ++++ coreutils-8.25/tests/misc/fold.pl 2016-02-08 19:07:10.314944661 -0600 +@@ -20,9 +20,18 @@ use strict; (my $program_name = $0) =~ s|.*/||; @@ -4214,7 +4295,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/fold.pl coreutils-8.23/tests/misc/fold my @Tests = ( ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}], -@@ -31,9 +40,48 @@ +@@ -31,9 +40,48 @@ my @Tests = ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}], ); @@ -4264,10 +4345,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/fold.pl coreutils-8.23/tests/misc/fold -my $prog = 'fold'; my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); exit $fail; -diff -Naur coreutils-8.23.orig/tests/misc/join.pl coreutils-8.23/tests/misc/join.pl ---- coreutils-8.23.orig/tests/misc/join.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/join.pl 2014-07-18 22:36:17.399067050 -0500 -@@ -25,6 +25,15 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/join.pl coreutils-8.25/tests/misc/join.pl +--- coreutils-8.25-orig/tests/misc/join.pl 2016-01-16 12:18:13.000000000 -0600 ++++ coreutils-8.25/tests/misc/join.pl 2016-02-08 19:07:10.315944664 -0600 +@@ -25,6 +25,15 @@ my $limits = getlimits (); my $prog = 'join'; @@ -4283,7 +4364,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/join.pl coreutils-8.23/tests/misc/join my $delim = chr 0247; sub t_subst ($) { -@@ -326,8 +335,49 @@ +@@ -329,8 +338,49 @@ foreach my $t (@tv) push @Tests, $new_ent; } @@ -4333,9 +4414,9 @@ diff -Naur coreutils-8.23.orig/tests/misc/join.pl coreutils-8.23/tests/misc/join my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -diff -Naur coreutils-8.23.orig/tests/misc/sort-mb-tests.sh coreutils-8.23/tests/misc/sort-mb-tests.sh ---- coreutils-8.23.orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600 -+++ coreutils-8.23/tests/misc/sort-mb-tests.sh 2014-07-18 22:36:17.399067050 -0500 +diff -Naurp coreutils-8.25-orig/tests/misc/sort-mb-tests.sh coreutils-8.25/tests/misc/sort-mb-tests.sh +--- coreutils-8.25-orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600 ++++ coreutils-8.25/tests/misc/sort-mb-tests.sh 2016-02-08 19:07:10.315944664 -0600 @@ -0,0 +1,45 @@ +#!/bin/sh +# Verify sort's multi-byte support. @@ -4382,10 +4463,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort-mb-tests.sh coreutils-8.23/tests/ +compare exp out || { fail=1; cat out; } + +Exit $fail -diff -Naur coreutils-8.23.orig/tests/misc/sort-merge.pl coreutils-8.23/tests/misc/sort-merge.pl ---- coreutils-8.23.orig/tests/misc/sort-merge.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/sort-merge.pl 2014-07-18 22:36:17.399067050 -0500 -@@ -26,6 +26,15 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/sort-merge.pl coreutils-8.25/tests/misc/sort-merge.pl +--- coreutils-8.25-orig/tests/misc/sort-merge.pl 2016-01-16 12:18:14.000000000 -0600 ++++ coreutils-8.25/tests/misc/sort-merge.pl 2016-02-08 19:07:10.316944667 -0600 +@@ -26,6 +26,15 @@ my $prog = 'sort'; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -4401,7 +4482,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort-merge.pl coreutils-8.23/tests/mis # three empty files and one that says 'foo' my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}}); -@@ -77,6 +86,39 @@ +@@ -77,6 +86,39 @@ my @Tests = {OUT=>$big_input}], ); @@ -4441,10 +4522,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort-merge.pl coreutils-8.23/tests/mis my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -diff -Naur coreutils-8.23.orig/tests/misc/sort.pl coreutils-8.23/tests/misc/sort.pl ---- coreutils-8.23.orig/tests/misc/sort.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/sort.pl 2014-07-18 22:36:17.400067026 -0500 -@@ -24,10 +24,15 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/sort.pl coreutils-8.25/tests/misc/sort.pl +--- coreutils-8.25-orig/tests/misc/sort.pl 2016-01-16 12:18:14.000000000 -0600 ++++ coreutils-8.25/tests/misc/sort.pl 2016-02-08 19:07:10.316944667 -0600 +@@ -24,10 +24,15 @@ my $prog = 'sort'; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -4461,7 +4542,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort.pl coreutils-8.23/tests/misc/sort # Since each test is run with a file name and with redirected stdin, # the name in the diagnostic is either the file name or "-". # Normalize each diagnostic to use '-'. -@@ -415,6 +420,37 @@ +@@ -424,6 +429,38 @@ foreach my $t (@Tests) } } @@ -4491,6 +4572,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort.pl coreutils-8.23/tests/misc/sort + #disable several failing tests until investigation, disable all tests with envvars set + next if (grep {ref $_ eq 'HASH' && exists $_->{ENV}} (@new_t)); + next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a"); ++ next if ($test_name =~ "11[ab]"); # avoid FP: expected result differs to MB result due to collation rules. + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; + } + push @Tests, @new; @@ -4499,7 +4581,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort.pl coreutils-8.23/tests/misc/sort @Tests = triple_test \@Tests; # Remember that triple_test creates from each test with exactly one "IN" -@@ -424,6 +460,7 @@ +@@ -433,6 +470,7 @@ foreach my $t (@Tests) # Remove the IN_PIPE version of the "output-is-input" test above. # The others aren't susceptible because they have three inputs each. @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; @@ -4507,10 +4589,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/sort.pl coreutils-8.23/tests/misc/sort my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -diff -Naur coreutils-8.23.orig/tests/misc/unexpand.pl coreutils-8.23/tests/misc/unexpand.pl ---- coreutils-8.23.orig/tests/misc/unexpand.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/unexpand.pl 2014-07-18 22:36:17.400067026 -0500 -@@ -27,6 +27,14 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/unexpand.pl coreutils-8.25/tests/misc/unexpand.pl +--- coreutils-8.25-orig/tests/misc/unexpand.pl 2016-01-16 12:18:14.000000000 -0600 ++++ coreutils-8.25/tests/misc/unexpand.pl 2016-02-08 19:07:10.317944671 -0600 +@@ -27,6 +27,14 @@ my $limits = getlimits (); my $prog = 'unexpand'; @@ -4525,7 +4607,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/unexpand.pl coreutils-8.23/tests/misc/ my @Tests = ( ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], -@@ -92,6 +100,37 @@ +@@ -92,6 +100,37 @@ my @Tests = {EXIT => 1}, {ERR => "$prog: tab stop value is too large\n"}], ); @@ -4563,10 +4645,10 @@ diff -Naur coreutils-8.23.orig/tests/misc/unexpand.pl coreutils-8.23/tests/misc/ my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -diff -Naur coreutils-8.23.orig/tests/misc/uniq.pl coreutils-8.23/tests/misc/uniq.pl ---- coreutils-8.23.orig/tests/misc/uniq.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/misc/uniq.pl 2014-07-18 22:36:17.400067026 -0500 -@@ -23,9 +23,17 @@ +diff -Naurp coreutils-8.25-orig/tests/misc/uniq.pl coreutils-8.25/tests/misc/uniq.pl +--- coreutils-8.25-orig/tests/misc/uniq.pl 2016-01-16 12:18:14.000000000 -0600 ++++ coreutils-8.25/tests/misc/uniq.pl 2016-02-08 19:07:10.317944671 -0600 +@@ -23,9 +23,17 @@ my $limits = getlimits (); my $prog = 'uniq'; my $try = "Try '$prog --help' for more information.\n"; @@ -4584,7 +4666,7 @@ diff -Naur coreutils-8.23.orig/tests/misc/uniq.pl coreutils-8.23/tests/misc/uniq # When possible, create a "-z"-testing variant of each test. sub add_z_variants($) { -@@ -261,6 +269,53 @@ +@@ -262,6 +270,53 @@ foreach my $t (@Tests) and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; } @@ -4638,12 +4720,12 @@ diff -Naur coreutils-8.23.orig/tests/misc/uniq.pl coreutils-8.23/tests/misc/uniq @Tests = add_z_variants \@Tests; @Tests = triple_test \@Tests; -diff -Naur coreutils-8.23.orig/tests/pr/pr-tests.pl coreutils-8.23/tests/pr/pr-tests.pl ---- coreutils-8.23.orig/tests/pr/pr-tests.pl 2014-07-11 06:00:07.000000000 -0500 -+++ coreutils-8.23/tests/pr/pr-tests.pl 2014-07-18 22:36:17.401067000 -0500 -@@ -23,6 +23,15 @@ - +diff -Naurp coreutils-8.25-orig/tests/pr/pr-tests.pl coreutils-8.25/tests/pr/pr-tests.pl +--- coreutils-8.25-orig/tests/pr/pr-tests.pl 2016-01-16 12:18:14.000000000 -0600 ++++ coreutils-8.25/tests/pr/pr-tests.pl 2016-02-08 19:07:10.318944674 -0600 +@@ -24,6 +24,15 @@ use strict; my $prog = 'pr'; + my $normalize_strerror = "s/': .*/'/"; +my $mb_locale; +#Uncomment the following line to enable multibyte tests @@ -4657,7 +4739,7 @@ diff -Naur coreutils-8.23.orig/tests/pr/pr-tests.pl coreutils-8.23/tests/pr/pr-t my @tv = ( # -b option is no longer an official option. But it's still working to -@@ -466,8 +475,48 @@ +@@ -467,8 +476,48 @@ push @Tests, {IN=>{3=>"x\ty\tz\n"}}, {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ]; diff --git a/coreutils/patches/coreutils-ipfire-disabled-tests.patch b/coreutils/patches/coreutils-ipfire-disabled-tests.patch index 648e6e3..0f7a04b 100644 --- a/coreutils/patches/coreutils-ipfire-disabled-tests.patch +++ b/coreutils/patches/coreutils-ipfire-disabled-tests.patch @@ -1,6 +1,5 @@ -diff -Nur coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk ---- coreutils-8.23-orig/tests/local.mk 2014-07-14 00:09:52.000000000 +0200 -+++ coreutils-8.23/tests/local.mk 2015-01-23 21:44:03.355661943 +0100 +--- coreutils-8.25_old/tests/local.mk 2016-01-16 19:18:13.000000000 +0100 ++++ coreutils-8.25_new/tests/local.mk 2016-09-03 12:59:41.798241660 +0200 @@ -107,7 +107,6 @@ all_root_tests = \ @@ -9,7 +8,7 @@ diff -Nur coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk tests/cp/preserve-gid.sh \ tests/cp/special-bits.sh \ tests/cp/cp-mv-enotsup-xattr.sh \ -@@ -121,8 +120,6 @@ +@@ -122,8 +121,6 @@ tests/install/install-C-root.sh \ tests/ls/capability.sh \ tests/ls/nameless-uid.sh \ @@ -18,16 +17,24 @@ diff -Nur coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk tests/misc/selinux.sh \ tests/misc/truncate-owned-by-other.sh \ tests/mkdir/writable-under-readonly.sh \ -@@ -517,8 +514,6 @@ +@@ -236,7 +233,6 @@ + tests/misc/test.pl \ + tests/misc/seq.pl \ + tests/misc/seq-long-double.sh \ +- tests/misc/seq-precision.sh \ + tests/misc/head.pl \ + tests/misc/head-elide-tail.pl \ + tests/tail-2/tail-n0f.sh \ +@@ -535,8 +531,6 @@ tests/du/trailing-slash.sh \ tests/du/two-args.sh \ tests/id/gnu-zero-uids.sh \ - tests/id/no-context.sh \ - tests/id/context.sh \ tests/id/uid.sh \ - tests/id/setgid.sh \ tests/id/zero.sh \ -@@ -527,7 +522,6 @@ + tests/id/smack.sh \ +@@ -544,7 +538,6 @@ tests/install/create-leading.sh \ tests/install/d-slashdot.sh \ tests/install/install-C.sh \ @@ -35,7 +42,7 @@ diff -Nur coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk tests/install/strip-program.sh \ tests/install/trap.sh \ tests/ln/backup-1.sh \ -@@ -579,7 +573,6 @@ +@@ -598,7 +591,6 @@ tests/mkdir/parents.sh \ tests/mkdir/perm.sh \ tests/mkdir/selinux.sh \ diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm index 806c880..855025d 100644 --- a/libtdb/libtdb.nm +++ b/libtdb/libtdb.nm @@ -4,7 +4,7 @@ ############################################################################### name = libtdb -version = 1.3.9 +version = 1.3.11 release = 1 groups = System/Libraries diff --git a/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm index 90fccd4..eae88d7 100644 --- a/perl-XML-Parser/perl-XML-Parser.nm +++ b/perl-XML-Parser/perl-XML-Parser.nm @@ -5,7 +5,7 @@ name = perl-XML-Parser version = 2.44 -release = 1.1 +release = 2 thisapp = XML-Parser-%{version} groups = Development/Libraries diff --git a/sip/sip.nm b/sip/sip.nm index acd28a4..f0249d7 100644 --- a/sip/sip.nm +++ b/sip/sip.nm @@ -9,8 +9,8 @@ release = 1 epoch = 1 major_ver = 4 -minor_ver = 13 -rev_ver = 2 +minor_ver = 18 +rev_ver = 1 groups = Development/Tools url = http://www.riverbankcomputing.com/software/sip/intro @@ -24,7 +24,9 @@ description tighter bindings. SIP is so called because it is a small SWIG. end -source_dl = http://www.riverbankcomputing.com/static/Downloads/sip%{major_ver}/ +source_dl = https://sourceforge.net/projects/pyqt/files/sip/sip-%{major_ver}.%{minor_ve… +sources = %{thisapp}.tar.gz + build requires diff --git a/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm index cf16053..222d5d9 100644 --- a/smartmontools/smartmontools.nm +++ b/smartmontools/smartmontools.nm @@ -4,7 +4,7 @@ ############################################################################### name = smartmontools -version = 5.40 +version = 6.5 release = 1 groups = System/Statistics @@ -21,7 +21,7 @@ description and failure. end -source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} +source_dl = http://sourceforge.net/projects/smartmontools/files/smartmontools/%{version} build requires diff --git a/sqlite/sqlite.nm b/sqlite/sqlite.nm index 9c0dfc9..9f8df40 100644 --- a/sqlite/sqlite.nm +++ b/sqlite/sqlite.nm @@ -4,9 +4,9 @@ ############################################################################### name = sqlite -version = 3.8.8.2 +version = 3.14.1 release = 1 -realver = 3080802 +realver = 3140100 groups = System/Databases url = http://www.sqlite.org/ @@ -23,7 +23,7 @@ description end thisapp = %{name}-autoconf-%{realver} -source_dl = http://www.sqlite.org/2015/ +source_dl = http://www.sqlite.org/2016/ build requires diff --git a/strace/patches/0001-linux-aarch64-add-missing-header.patch b/strace/patches/0001-linux-aarch64-add-missing-header.patch deleted file mode 100644 index 2b74775..0000000 --- a/strace/patches/0001-linux-aarch64-add-missing-header.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e1e838360288805b6cb561c21e4e7a1ea32e7772 Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour(a)openwide.fr> -Date: Sat, 4 Apr 2015 00:49:52 +0200 -Subject: [PATCH] linux/aarch64: add missing header. - -linux/aarch64/arch_regs.h file is missing in the strace-4.10.tar.xz archive. -Add the one from the release 4.10 tag. - -Signed-off-by: Romain Naour <romain.naour(a)openwide.fr> ---- - linux/aarch64/arch_regs.h | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 linux/aarch64/arch_regs.h - -diff --git a/linux/aarch64/arch_regs.h b/linux/aarch64/arch_regs.h -new file mode 100644 -index 0000000..9a5e33e ---- /dev/null -+++ b/linux/aarch64/arch_regs.h -@@ -0,0 +1,2 @@ -+extern uint64_t *const aarch64_sp_ptr; -+extern uint32_t *const arm_sp_ptr; --- -1.9.3 - diff --git a/strace/strace.nm b/strace/strace.nm index 6d179c5..19758a9 100644 --- a/strace/strace.nm +++ b/strace/strace.nm @@ -4,7 +4,7 @@ ############################################################################### name = strace -version = 4.10 +version = 4.13 release = 1 groups = Development/Debuggers diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 54b4f7d..73cef82 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,7 +4,7 @@ ############################################################################### name = strongswan -version = 5.4.0 +version = 5.5.0 release = 1 groups = Networking/VPN diff --git a/swig/patches/swig-1.3.23-pylib.patch b/swig/patches/swig-1.3.23-pylib.patch deleted file mode 100644 index 85fa1e3..0000000 --- a/swig/patches/swig-1.3.23-pylib.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- SWIG-1.3.23/configure.in.pylib 2004-11-02 00:45:57.000000000 +0100 -+++ SWIG-1.3.23/configure.in 2004-11-23 12:20:12.552926982 +0100 -@@ -574,9 +574,11 @@ - - # Set the include directory - -+ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` -+ - AC_MSG_CHECKING(for Python header files) - if test -r $PYPREFIX/include/$PYVERSION/Python.h; then -- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config" -+ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" - fi - if test -z "$PYINCLUDE"; then - if test -r $PYPREFIX/include/Py/Python.h; then -@@ -587,13 +589,6 @@ - - # Set the library directory blindly. This probably won't work with older versions - AC_MSG_CHECKING(for Python library) -- dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR" -- for i in $dirs; do -- if test -d $PYEPREFIX/$PYLIBDIR/$i; then -- PYLIB="$PYEPREFIX/$PYLIBDIR/$i" -- break -- fi -- done - if test -z "$PYLIB"; then - AC_MSG_RESULT(Not found) - else diff --git a/swig/patches/swig200-rh623854.patch b/swig/patches/swig200-rh623854.patch deleted file mode 100644 index 5665252..0000000 --- a/swig/patches/swig200-rh623854.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg ---- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100 -+++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200 -@@ -45,8 +45,18 @@ - #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg - #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) - #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) --#define SWIG_fail goto fail -+#define SWIG_fail goto fail - -+/* -+ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of -+ * CObjects API. -+ */ -+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \ -+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) -+#define USE_CAPSULES -+#define TYPE_POINTER_NAME \ -+ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) -+#endif - - /* Runtime API implementation */ - -@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) { - #ifdef SWIG_LINK_RUNTIME - type_pointer = SWIG_ReturnGlobalTypeList((void *)0); - #else -+#ifdef USE_CAPSULES -+ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0); -+#else - type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); -+#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - type_pointer = (void *)0; -@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na - SWIGRUNTIME void - SWIG_Python_DestroyModule(void *vptr) - { -+ size_t i; -+#ifdef USE_CAPSULES -+ swig_module_info *swig_module = -+ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME); -+#else - swig_module_info *swig_module = (swig_module_info *) vptr; -+#endif - swig_type_info **types = swig_module->types; -- size_t i; - for (i =0; i < swig_module->size; ++i) { - swig_type_info *ty = types[i]; - if (ty->owndata) { -@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info * - PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - swig_empty_runtime_method_table); - #endif -+#ifdef USE_CAPSULES -+ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, -+ (PyCapsule_Destructor)SWIG_Python_DestroyModule); -+#else - PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); -+#endif - if (pointer && module) { -+#ifdef USE_CAPSULES -+ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); -+#else - PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); -+#endif - } else { - Py_XDECREF(pointer); - } -@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type) - PyObject *obj = PyDict_GetItem(cache, key); - swig_type_info *descriptor; - if (obj) { -+#ifdef USE_CAPSULES -+ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type); -+#else - descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); -+#endif - } else { - swig_module_info *swig_module = SWIG_Python_GetModule(); - descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); - if (descriptor) { -+#ifdef USE_CAPSULES -+ obj = PyCapsule_New(descriptor, type, NULL); -+#else - obj = PyCObject_FromVoidPtr(descriptor, NULL); -+#endif - PyDict_SetItem(cache, key, obj); - Py_DECREF(obj); - } diff --git a/swig/swig.nm b/swig/swig.nm index e3e68cc..675dc1f 100644 --- a/swig/swig.nm +++ b/swig/swig.nm @@ -4,7 +4,7 @@ ############################################################################### name = swig -version = 2.0.1 +version = 3.0.10 release = 1 groups = Development/Tools diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 40a5cd7..68fc555 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -4,8 +4,8 @@ ############################################################################### name = tcpdump -version = 4.3.0 -release = 2 +version = 4.7.4 +release = 1 groups = Networking/Sniffer url = http://www.tcpdump.org/ diff --git a/tinc/tinc.nm b/tinc/tinc.nm index c1a8624..111e5fa 100644 --- a/tinc/tinc.nm +++ b/tinc/tinc.nm @@ -4,7 +4,7 @@ ############################################################################### name = tinc -version = 1.0.23 +version = 1.0.28 release = 1 groups = Networking/Tools diff --git a/tmux/tmux.nm b/tmux/tmux.nm index ac3a556..2a58b69 100644 --- a/tmux/tmux.nm +++ b/tmux/tmux.nm @@ -4,7 +4,7 @@ ############################################################################### name = tmux -version = 2.0 +version = 2.2 release = 1 groups = Application/System @@ -19,7 +19,7 @@ description programs such as GNU Screen. end -source_dl = http://downloads.sourceforge.net/%{name}/ +source_dl = https://github.com/tmux/tmux/releases/download/%{version} build requires diff --git a/traceroute/traceroute.nm b/traceroute/traceroute.nm index 5d3a7f8..44c4ecc 100644 --- a/traceroute/traceroute.nm +++ b/traceroute/traceroute.nm @@ -4,7 +4,7 @@ ############################################################################### name = traceroute -version = 2.0.12 +version = 2.1.0 release = 1 groups = Application/Internet diff --git a/tree/patches/tree-args.patch b/tree/patches/tree-args.patch deleted file mode 100644 index 5fa5dd2..0000000 --- a/tree/patches/tree-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.6.0/tree.c.args tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.args 2013-04-11 11:53:47.676572649 +0100 -+++ tree-1.6.0/tree.c 2013-04-11 11:56:10.962350448 +0100 -@@ -536,6 +536,8 @@ void usage(int n) - " --filelimit # Do not descend dirs with more than # files in them.\n" - " --timefmt <f> Print and format time according to the format <f>.\n" - " -o filename Output to file instead of stdout.\n" -+ " --du Print directory sizes.\n" -+ " --prune Prune empty directories from the output.\n" - " -------- File options ---------\n" - " -q Print non-printable characters as '?'.\n" - " -N Print non-printable characters as is.\n" diff --git a/tree/patches/tree-no-color-by-default.patch b/tree/patches/tree-no-color-by-default.patch deleted file mode 100644 index 374add4..0000000 --- a/tree/patches/tree-no-color-by-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up tree-1.6.0/tree.c.no-color-by-default tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.no-color-by-default 2011-06-27 16:14:14.190548385 +0100 -+++ tree-1.6.0/tree.c 2011-06-27 16:14:27.257295243 +0100 -@@ -79,7 +79,8 @@ int main(int argc, char **argv) - q = p = dtotal = ftotal = 0; - aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag = FALSE; - Dflag = qflag = Nflag = Qflag = Rflag = hflag = Hflag = siflag = cflag = FALSE; -- noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE; -+ noindent = force_color = xdev = noreport = nolinks = FALSE; -+ nocolor = TRUE; - dirsfirst = nosort = inodeflag = devflag = Xflag = FALSE; - duflag = pruneflag = FALSE; - flimit = 0; diff --git a/tree/patches/tree-no-strip.patch b/tree/patches/tree-no-strip.patch deleted file mode 100644 index 5f46ada..0000000 --- a/tree/patches/tree-no-strip.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up tree-1.6.0/Makefile.no-strip tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.no-strip 2011-06-24 15:25:27.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-07-04 11:11:17.662036666 +0100 -@@ -32,7 +32,7 @@ OBJS=tree.o unix.o html.o xml.o hash.o c - # Linux defaults: - #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS=-s -+LDFLAGS= - - # Uncomment for FreeBSD: - #CFLAGS=-O2 -Wall -fomit-frame-pointer -@@ -97,7 +97,7 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi - install doc/$(MAN) $(MANDIR)/$(MAN) - diff --git a/tree/patches/tree-preserve-timestamps.patch b/tree/patches/tree-preserve-timestamps.patch deleted file mode 100644 index 2e432a5..0000000 --- a/tree/patches/tree-preserve-timestamps.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tree-1.6.0/Makefile.preserve-timestamps tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.preserve-timestamps 2011-06-27 16:11:26.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-06-27 16:12:36.394443602 +0100 -@@ -97,9 +97,9 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install -p $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi -- install doc/$(MAN) $(MANDIR)/$(MAN) -+ install -p doc/$(MAN) $(MANDIR)/$(MAN) - - distclean: - if [ -f tree.o ]; then rm *.o; fi diff --git a/tree/tree.nm b/tree/tree.nm index 710ef4c..5f5583e 100644 --- a/tree/tree.nm +++ b/tree/tree.nm @@ -4,7 +4,7 @@ ############################################################################### name = tree -version = 1.6.0 +version = 1.7.0 release = 1 groups = Applications/File hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3943a54036fcce71d57b1bbd2c2759c64c5f1f86
by git＠ipfire.org 05 Sep '16

05 Sep '16

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 3943a54036fcce71d57b1bbd2c2759c64c5f1f86 (commit) from d996e17ab80ce674e3facc04aaa6e918e4d66fbb (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 3943a54036fcce71d57b1bbd2c2759c64c5f1f86 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Sep 2 20:35:23 2016 +0200 Libvirt: Fix update.sh script The virtlogd could only be restarted when the daemons run. The update.sh script tried to restart the daemon no matter if the daemons run or not. This behaviour produce problems. An If statement now checks if the daemon runs or not and execute the command that is suitable for the situation. Fixes: #11172 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/libvirt | 2 +- src/paks/libvirt/update.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) Difference in files: diff --git a/lfs/libvirt b/lfs/libvirt index 6a28b7b..8ebca73 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 10 +PAK_VER = 11 DEPS = "libpciaccess libyajl ncat qemu" diff --git a/src/paks/libvirt/update.sh b/src/paks/libvirt/update.sh index fd0ca97..ab57cbf 100644 --- a/src/paks/libvirt/update.sh +++ b/src/paks/libvirt/update.sh @@ -63,7 +63,13 @@ chown -R nobody:kvm /var/lib/libvirt/images restore_backup ${NAME} #restart virtlogd to use the new version +if [ -f "/var/run/virtlogd.pid" ]; then +# the daemon runs restart him /etc/init.d/virtlogd restart +else +# the daemon runs not start him +/etc/init.d/virtlogd start +fi start_service --background libvirtd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9f4e560dc6e3af3740743580208c74ad3efc45fb
by git＠ipfire.org 05 Sep '16

05 Sep '16

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 3.x development tree". The branch, master has been updated via 9f4e560dc6e3af3740743580208c74ad3efc45fb (commit) via 26e1ec80f97e1b178836c3ea731b09a97dd8b9c8 (commit) from 83a5eb26574a09dc234e4df2ffcde3a28ce9284a (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 9f4e560dc6e3af3740743580208c74ad3efc45fb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 5 10:42:58 2016 +0200 python-rrdtool: Update to version 0.1.5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 26e1ec80f97e1b178836c3ea731b09a97dd8b9c8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 5 10:41:29 2016 +0200 quagga: Pre-create PID directory with correct permissions Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../patches/python-rrdtool-fix-SEGV.patch | 47 ---------------------- python-rrdtool/python-rrdtool.nm | 4 +- quagga/quagga.nm | 12 +++++- 3 files changed, 13 insertions(+), 50 deletions(-) delete mode 100644 python-rrdtool/patches/python-rrdtool-fix-SEGV.patch Difference in files: diff --git a/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch b/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch deleted file mode 100644 index c45316d..0000000 --- a/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a45ed2ad6f92730a479522c46febb1b56b442aba Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon, 23 Nov 2015 02:15:33 +0000 -Subject: [PATCH] Fix crash in lastupdate() method - -When a RRD database contains floating point values, the -PyRRD_Int_FromString function returns NULL, which will then be tried -to be put into a dictionary. -This operation fails as PyDict_SetItemString does not handle NULL -and the program crashes with SEGV. - -This patch parses the value as a floating point number -and will add that instead. If the value could not be parsed, -None will be added instead. - -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - rrdtoolmodule.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/rrdtoolmodule.c b/rrdtoolmodule.c -index dead4ff..4713850 100644 ---- a/rrdtoolmodule.c -+++ b/rrdtoolmodule.c -@@ -880,9 +880,19 @@ _rrdtool_lastupdate(PyObject *self, PyObject *args) - PyDict_SetItemString(ret, "ds", ds_dict); - - for (i = 0; i < ds_cnt; i++) { -- PyDict_SetItemString(ds_dict, -- ds_names[i], -- PyRRD_Int_FromString(last_ds[i], NULL, 10)); -+ PyObject* val = Py_None; -+ -+ double num; -+ if (sscanf(last_ds[i], "%lf", &num) == 1) { -+ val = PyFloat_FromDouble(num); -+ } -+ -+ if (!val) -+ return NULL; -+ -+ PyDict_SetItemString(ds_dict, ds_names[i], val); -+ Py_DECREF(val); -+ - free(last_ds[i]); - free(ds_names[i]); - } diff --git a/python-rrdtool/python-rrdtool.nm b/python-rrdtool/python-rrdtool.nm index 7fa8b8b..68045f0 100644 --- a/python-rrdtool/python-rrdtool.nm +++ b/python-rrdtool/python-rrdtool.nm @@ -4,7 +4,7 @@ ############################################################################### name = python-rrdtool -version = 0.1.2 +version = 0.1.5 release = 1 groups = System/Libraries @@ -17,7 +17,7 @@ description object-oriented way to work with Round Robin Databases. end -source_dl = https://pypi.python.org/packages/source/r/rrdtool/ +source_dl = https://github.com/commx/python-rrdtool/archive/v%{version}.tar.gz#/ build requires diff --git a/quagga/quagga.nm b/quagga/quagga.nm index 33b2530..57965a3 100644 --- a/quagga/quagga.nm +++ b/quagga/quagga.nm @@ -5,7 +5,7 @@ name = quagga version = 1.0.20160315 -release = 1 +release = 2 groups = Networking/Routing url = http://www.quagga.net/ @@ -31,8 +31,13 @@ build systemd-units end + prepare_cmds + %{create_user} + end + configure_options += \ --sysconfdir=/etc/quagga \ + --localstatedir=%{localstatedir}/run/quagga \ --disable-static \ --disable-watchquagga \ --enable-multipath=64 \ @@ -40,6 +45,11 @@ build --disable-pimd \ --disable-ripd \ --disable-ripngd + + install_cmds + mkdir -pv %{localstatedir}/run/quagga + chown -v quagga.quagga %{localstatedir}/run/quagga + end end create_user hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2016