[debian-edu-commits] debian-edu/pkg-team/ 01/11: debian/patches: Drop all e2guardian 3.x patches. No applicable for 4.x release series.

Mike Gabriel sunweaver at debian.org
Mon Feb 5 15:50:17 UTC 2018


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository e2guardian.

commit 3068ce8572cf8a733e161b1cd62f16c44d172eb0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 5 15:28:24 2018 +0100

    debian/patches: Drop all e2guardian 3.x patches. No applicable for 4.x release series.
---
 ...1_fix-certificate-bug-with-chrome-browser.patch |  69 --------
 debian/patches/1001_idem-potent-build.patch        | 192 ---------------------
 debian/patches/1002_fix-message-typos.patch        | 130 --------------
 debian/patches/2001_remove-w3c-badge.patch         |  20 ---
 debian/patches/series                              |   4 -
 5 files changed, 415 deletions(-)

diff --git a/debian/patches/0001_fix-certificate-bug-with-chrome-browser.patch b/debian/patches/0001_fix-certificate-bug-with-chrome-browser.patch
deleted file mode 100644
index 803afe0..0000000
--- a/debian/patches/0001_fix-certificate-bug-with-chrome-browser.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0e2bbdea7b4433b75fb73f8e915dbe0e1095fed1 Mon Sep 17 00:00:00 2001
-From: Fredb <numsys at free.fr>
-Date: Wed, 31 May 2017 09:33:09 +0200
-Subject: [PATCH] Bug #216 (v3.4.0.3) Fix certificate bug with chrome browser
-
----
- src/CertificateAuthority.cpp | 24 +++++++++++++++++++++++-
- src/CertificateAuthority.hpp |  1 +
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/src/CertificateAuthority.cpp b/src/CertificateAuthority.cpp
-index 6202002..4e03ded 100755
---- a/src/CertificateAuthority.cpp
-+++ b/src/CertificateAuthority.cpp
-@@ -118,7 +118,7 @@ bool CertificateAuthority::getSerial(const char *commonname, struct ca_serial *c
-     // added to generate different serial number than previous versions
-     //   needs to be added as an option
-     std::string sname(commonname );
--    sname += "A";
-+    sname += "B";
- 
- #ifdef DGDEBUG
-     std::cout << "Generating serial no for " << commonname << std::endl;
-@@ -390,6 +390,14 @@ X509 *CertificateAuthority::generateCertificate(const char *commonname, struct c
-         return NULL;
-     }
- 
-+{
-+    String temp1 = "DNS:";
-+    String temp2 = commonname;
-+    temp1 = temp1 + temp2;
-+    char    *value = (char*) temp1.toCharArray();
-+if( !addExtension(newCert, NID_subject_alt_name, value))
-+        log_ssl_errors("Error adding subjectAltName to the request", commonname);
-+}
-     //sign it using the ca
-     ERR_clear_error();
-     if (!X509_sign(newCert, _caPrivKey, EVP_sha256())) {
-@@ -521,4 +529,18 @@ CertificateAuthority::~CertificateAuthority()
-     if (_caPrivKey) EVP_PKEY_free(_caPrivKey);
-     if (_certPrivKey) EVP_PKEY_free(_certPrivKey);
- }
-+
-+bool CertificateAuthority::addExtension(X509 *cert, int nid, char *value)
-+{
-+    X509_EXTENSION *ex = NULL;
-+    
-+    ex = X509V3_EXT_conf_nid(NULL,NULL , nid, value);
-+
-+    int result = X509_add_ext(cert, ex, -1);
-+
-+    X509_EXTENSION_free(ex);
-+
-+    return (result > 0) ? true : false;
-+}
-+
- #endif //__SSLMITM
-diff --git a/src/CertificateAuthority.hpp b/src/CertificateAuthority.hpp
-index 230932b..0aecf61 100755
---- a/src/CertificateAuthority.hpp
-+++ b/src/CertificateAuthority.hpp
-@@ -25,6 +25,7 @@ class CertificateAuthority
-     time_t _ca_end;
-     static int do_mkdir(const char *path, mode_t mode);
-     int mkpath(const char *path, mode_t mode);
-+    bool addExtension(X509 *cert, int nid, char *value);
- 
-     public:
-     CertificateAuthority(const char *caCert,
diff --git a/debian/patches/1001_idem-potent-build.patch b/debian/patches/1001_idem-potent-build.patch
deleted file mode 100644
index 38634cc..0000000
--- a/debian/patches/1001_idem-potent-build.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Description: Fix clean rules in Makefiles. Make build idempotent.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/configs/authplugins/Makefile.am
-+++ b/configs/authplugins/Makefile.am
-@@ -1,9 +1,8 @@
- DISTCLEANFILES = Makefile.in
-+CLEANFILES = ip.conf
- 
- DGDATADIR = $(DGCONFDIR)/authplugins
- 
--SUBDIRS = .
--
- FLISTS = proxy-basic.conf ident.conf ip.conf proxy-digest.conf \
- 	 port.conf 
- 
---- a/configs/contentscanners/Makefile.am
-+++ b/configs/contentscanners/Makefile.am
-@@ -1,12 +1,14 @@
- DISTCLEANFILES = Makefile.in \
- 		       clamdscan.conf icapscan.conf \
- 		       kavdscan.conf commandlinescan.conf
-+CLEANFILES = avastdscan.conf \
-+             clamdscan.conf \
-+             commandlinescan.conf \
-+             icapscan.conf \
-+             kavdscan.conf
- 
- DGDATADIR = $(DGCONFDIR)/contentscanners
- 
--SUBDIRS = .
--
--
- FLISTS = 
- 
- if ENABLE_CLAMD
---- a/configs/Makefile.am
-+++ b/configs/Makefile.am
-@@ -1,8 +1,9 @@
--DISTCLEANFILES = Makefile.in \
--e2guardian.conf \
--e2guardianf1.conf
-+DISTCLEANFILES = Makefile.in
- 
--SUBDIRS = lists downloadmanagers authplugins .
-+CLEANFILES = e2guardian.conf \
-+             e2guardianf1.conf
-+
-+SUBDIRS = lists downloadmanagers authplugins
- 
- if NEED_CSCONFIGS
- SUBDIRS += contentscanners
---- a/configs/downloadmanagers/Makefile.am
-+++ b/configs/downloadmanagers/Makefile.am
-@@ -1,10 +1,9 @@
- DISTCLEANFILES = Makefile.in \
- 		       default.conf fancy.conf trickle.conf
-+CLEANFILES = default.conf fancy.conf trickle.conf
- 
- DGDATADIR = $(DGCONFDIR)/downloadmanagers
- 
--SUBDIRS = .
--
- FLISTS = default.conf
- 
- if ENABLE_FANCYDM
---- a/configs/lists/Makefile.am
-+++ b/configs/lists/Makefile.am
-@@ -1,10 +1,11 @@
--DISTCLEANFILES = Makefile.in \
--		bannedphraselist bannedsitelist bannedurllist \
--		exceptionphraselist nocheckcertsitelist weightedphraselist
-+DISTCLEANFILES = Makefile.in
-+
-+CLEANFILES = bannedphraselist bannedsitelist bannedurllist \
-+             exceptionphraselist nocheckcertsitelist weightedphraselist
- 
- DGDATADIR = $(DGCONFDIR)/lists
- 
--SUBDIRS = phraselists . authplugins bannedrooms
-+SUBDIRS = phraselists authplugins bannedrooms
- 
- if NEED_CSLISTS
- SUBDIRS += contentscanners
---- a/data/scripts/Makefile.am
-+++ b/data/scripts/Makefile.am
-@@ -1,6 +1,10 @@
- DISTCLEANFILES = Makefile.in
--
--SUBDIRS= .
-+CLEANFILES = bsd-init \
-+             e2guardian \
-+             e2guardian.service \
-+             logrotation \
-+             solaris-init \
-+             systemv-init
- 
- DATATOPDIR = $(datadir)/$(PACKAGE_NAME)/scripts
- 
-@@ -23,4 +27,3 @@
- 	for l in $(FLISTS) ; do \
- 		rm -f $(DESTDIR)$(DATATOPDIR)/$$l ; \
- 	done
--
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,14 @@
--DISTCLEANFILES = Makefile.in \
--aclocal.m4 \
--config.guess \
--config.h.in \
--config.sub \
--configure \
--dgconfig.h.in \
--configure
--SUBDIRS= . doc data configs src
-+DISTCLEANFILES = README \
-+                 Makefile.in \
-+                 aclocal.m4 \
-+                 config.guess \
-+                 config.h.in \
-+                 config.sub \
-+                 configure \
-+                 dgconfig.h.in \
-+                 compile \
-+                 configure
-+
-+SUBDIRS= doc data configs src
- 
- EXTRA_DIST = autogen.sh UPGRADING
---- a/configs/lists/authplugins/Makefile.am
-+++ b/configs/lists/authplugins/Makefile.am
-@@ -2,8 +2,6 @@
- 
- DGDATADIR = $(DGCONFDIR)/lists/authplugins
- 
--SUBDIRS = .
--
- WLISTS = ipgroups portgroups
- 
- EXTRA_DIST = $(WLISTS)
---- a/configs/lists/bannedrooms/Makefile.am
-+++ b/configs/lists/bannedrooms/Makefile.am
-@@ -2,8 +2,6 @@
- 
- DGDATADIR = $(DGCONFDIR)/lists/bannedrooms
- 
--SUBDIRS = .
--
- WLISTS = default
- 
- EXTRA_DIST = $(WLISTS)
---- a/configs/lists/contentscanners/Makefile.am
-+++ b/configs/lists/contentscanners/Makefile.am
-@@ -2,8 +2,6 @@
- 
- DGDATADIR = $(DGCONFDIR)/lists/contentscanners
- 
--SUBDIRS = .
--
- WLISTS = exceptionvirusmimetypelist exceptionvirusextensionlist \
-          exceptionvirussitelist exceptionvirusurllist
- 
---- a/configs/lists/downloadmanagers/Makefile.am
-+++ b/configs/lists/downloadmanagers/Makefile.am
-@@ -2,8 +2,6 @@
- 
- DGDATADIR = $(DGCONFDIR)/lists/downloadmanagers
- 
--SUBDIRS = .
--
- WLISTS = managedmimetypelist managedextensionlist
- 
- EXTRA_DIST = $(WLISTS)
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -1,6 +1,6 @@
- DISTCLEANFILES = Makefile.in
- 
--SUBDIRS= languages . scripts
-+SUBDIRS= languages scripts
- 
- DATATOPDIR = $(datadir)/$(PACKAGE_NAME)
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--clean_SUBDIRS= . downloadmanagers contentscanners authplugins
-+clean_SUBDIRS= downloadmanagers contentscanners authplugins
- DISTCLEANFILES = Makefile.in
- 
- # A MASSIVE thank you to Lawrence Manning for pointing out the
diff --git a/debian/patches/1002_fix-message-typos.patch b/debian/patches/1002_fix-message-typos.patch
deleted file mode 100644
index b0d397b..0000000
--- a/debian/patches/1002_fix-message-typos.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Fix several spelling errors in upstream code base.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/e2guardian/e2guardian/pull/144
-
---- a/src/FatController.cpp
-+++ b/src/FatController.cpp
-@@ -130,7 +130,7 @@
-         old_umask = umask(S_IWGRP | S_IWOTH);
-         fs = fopen(o.dstat_location.c_str(), "a");
-         if (fs) {
--            fprintf(fs, "time		childs 	busy	free	wait	births	deaths	conx	conx/s\n");
-+            fprintf(fs, "time		children 	busy	free	wait	births	deaths	conx	conx/s\n");
-         } else {
-             syslog(LOG_ERR, "Unable to open dstats_log %s for writing\nContinuing with logging\n",
-                 o.dstat_location.c_str());
-@@ -1962,7 +1962,7 @@
-                                         else
-                                             fprintf(mail, "Subject: %s\n", o.fg[filtergroup]->contentsubject.c_str());
- 
--                                        fprintf(mail, "%i violation%s ha%s occured within %i seconds.\n",
-+                                        fprintf(mail, "%i violation%s ha%s occurred within %i seconds.\n",
-                                             curv_tmp,
-                                             (curv_tmp == 1) ? "" : "s",
-                                             (curv_tmp == 1) ? "s" : "ve",
-@@ -2828,7 +2828,7 @@
-     if (reloadconfig) {
-         syslog(LOG_INFO, "Reconfiguring E2guardian: done");
-     } else {
--        syslog(LOG_INFO, "Started sucessfully.");
-+        syslog(LOG_INFO, "Started successfully.");
-         //dystat = new stat_rec;
-         dystat->start();
-     }
---- a/src/FDTunnel.cpp
-+++ b/src/FDTunnel.cpp
-@@ -121,7 +121,7 @@
-         } else
- #endif
-             if (selectEINTR(maxfd + 1, &inset, NULL, NULL, &t) < 1) {
--            break; // an error occured or it timed out so end while()
-+            break; // an error occurred or it timed out so end while()
-         }
- 
-         if (FD_ISSET(fdfrom, &inset)) { // fdfrom is ready to be read from
-@@ -135,7 +135,7 @@
- 
-             // read as much as is available
-             if (rc < 0) {
--                break; // an error occured so end the while()
-+                break; // an error occurred so end the while()
-             } else if (!rc) {
-                 done = true; // none received so pipe is closed so flag it
-             } else { // some data read
-@@ -147,7 +147,7 @@
-                 t = timeout; // take a copy to work with
- 
-                 if (selectEINTR(fdto + 1, NULL, &outset, NULL, &t) < 1) {
--                    break; // an error occured or timed out so end while()
-+                    break; // an error occurred or timed out so end while()
-                 }
- 
-                 if (FD_ISSET(fdto, &outset)) { // fdto ready to write to
-@@ -179,7 +179,7 @@
-             rc = sockto.readFromSocket(buff, sizeof(buff), 0, 0, false);
- 
-             if (rc < 0) {
--                break; // an error occured so end the while()
-+                break; // an error occurred so end the while()
-             } else if (!rc) {
-                 done = true; // none received so pipe is closed so flag it
-                 break;
-@@ -191,7 +191,7 @@
-                 t = timeout; // take a copy to work with
- 
-                 if (selectEINTR(fdfrom + 1, NULL, &outset, NULL, &t) < 1) {
--                    break; // an error occured or timed out so end while()
-+                    break; // an error occurred or timed out so end while()
-                 }
- 
-                 if (FD_ISSET(fdfrom, &outset)) { // fdfrom ready to write to
---- a/src/downloadmanagers/default.cpp
-+++ b/src/downloadmanagers/default.cpp
-@@ -202,7 +202,7 @@
-             // grab a block of input, doubled each time
- 
-             if (rc <= 0) {
--                break; // an error occured so end the while()
-+                break; // an error occurred so end the while()
-                 // or none received so pipe is closed
-             } else {
-                 bytesremaining -= rc;
---- a/src/downloadmanagers/fancy.cpp
-+++ b/src/downloadmanagers/fancy.cpp
-@@ -375,7 +375,7 @@
-             // grab a block of input, doubled each time
- 
-             if (rc <= 0) {
--                break; // an error occured so end the while()
-+                break; // an error occurred so end the while()
-                 // or none received so pipe is closed
-             } else {
-                 /*if (d->data != temp)
---- a/src/downloadmanagers/trickle.cpp
-+++ b/src/downloadmanagers/trickle.cpp
-@@ -235,7 +235,7 @@
-             // grab a block of input, doubled each time
- 
-             if (rc <= 0) {
--                break; // an error occured so end the while()
-+                break; // an error occurred so end the while()
-                 // or none received so pipe is closed
-             } else {
-                 bytesremaining -= rc;
---- a/src/OptionContainer.cpp
-+++ b/src/OptionContainer.cpp
-@@ -1102,12 +1102,12 @@
-             exit(1);
-         }
-         if (infile.fail()) {
--            syslog(LOG_ERR, " Unexpected failue on read");
-+            syslog(LOG_ERR, " Unexpected failure on read");
-             std::cerr << " Unexpected failure on read: " << filename.c_str() << std::endl;
-             exit(1);
-         }
-         if (infile.bad()) {
--            syslog(LOG_ERR, " Unexpected badbit failue on read");
-+            syslog(LOG_ERR, " Unexpected badbit failure on read");
-             std::cerr << " Unexpected badbit failure on read: " << filename.c_str() << std::endl;
-             exit(1);
-         }
diff --git a/debian/patches/2001_remove-w3c-badge.patch b/debian/patches/2001_remove-w3c-badge.patch
deleted file mode 100644
index 036eb1f..0000000
--- a/debian/patches/2001_remove-w3c-badge.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Remove external links to W3C (avoid privacy breach)
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/contrib/template.html
-+++ b/contrib/template.html
-@@ -119,14 +119,6 @@
- 					<span style="font-size:8pt">
- 						Powered by <a href="http://www.e2guardian.org" target="_blank">E2Guardian</a>
- 					</span>
--					<p>
--						<a href="http://validator.w3.org/check?uri=referer">
--							<img class="valid" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional" />
--						</a>
--						<a href="http://jigsaw.w3.org/css-validator/">
--							<img class="valid" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
--						</a>
--					</p>
- 				</td>
- 			</tr>
- 		</table>
diff --git a/debian/patches/series b/debian/patches/series
index 12704da..f9ecc2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-0001_fix-certificate-bug-with-chrome-browser.patch
-1001_idem-potent-build.patch
-1002_fix-message-typos.patch
-2001_remove-w3c-badge.patch
 2002_Debian-clamd-socket.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/e2guardian.git



More information about the debian-edu-commits mailing list