[pkg-lynx-commits] [lynx-cur] 03/03: Refresh patches + update d/changelog for new upstream dev release

Axel Beckert abe at deuxchevaux.org
Sun Dec 20 22:55:08 UTC 2015 

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

abe pushed a commit to branch master
in repository lynx-cur.

commit 0aeb915d1137834305cad493c1ea6c9293befa1c
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Dec 20 17:36:29 2015 +0100

    Refresh patches + update d/changelog for new upstream dev release
    
    Use DEB_CFLAGS_MAINT_APPEND += -DNO_BUILDSTAMP instead of patching out
    __DATE__ and __TIME__ since upstream provides that feature for that
    purpose.
---
 debian/changelog                                   |   8 +-
 debian/patches/20_use_gzip-n.diff                  |  33 ---
 debian/patches/40_reproducible_build.diff          |  62 -----
 debian/patches/add_client_certificate_support.diff | 251 ---------------------
 debian/patches/fix-typos.diff                      |  34 ---
 debian/patches/gnutls_add_rehandshake_support.diff |  80 -------
 debian/patches/gnutls_set_default_priority.diff    |  36 ---
 debian/patches/lynxcfg.patch                       |  24 +-
 debian/patches/manpage_improved.patch              |  17 --
 debian/patches/series                              |   8 -
 debian/patches/use-dpkg-buildflags.patch           |  20 --
 debian/rules                                       |   2 +-
 12 files changed, 23 insertions(+), 552 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09aa7a3..3525114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-lynx-cur (2.8.9dev6-6) UNRELEASED; urgency=medium
+lynx-cur (2.8.9dev7-1) UNRELEASED; urgency=medium
 
+  * New upstream developement release.
+    + Remove all patches applied upstream (partially applied modified)
+    + export NO_BUILDSTAMP to make build reproducible (instead of
+      patching)
   * Prefix all debhelper files with the according package name for
     consistency.
 
- -- Axel Beckert <abe at debian.org>  Sat, 28 Nov 2015 22:35:26 +0100
+ -- Axel Beckert <abe at debian.org>  Sun, 20 Dec 2015 17:36:12 +0100
 
 lynx-cur (2.8.9dev6-5) unstable; urgency=medium
 
diff --git a/debian/patches/20_use_gzip-n.diff b/debian/patches/20_use_gzip-n.diff
deleted file mode 100644
index e776930..0000000
--- a/debian/patches/20_use_gzip-n.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Pass -n option to gzip.
- This avoids package-contains-timestamped-gzip lintian error.
-Author: Andreas Metzler <ametzler at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2014-12-27
-
-Index: lynx-cur/configure
-===================================================================
---- lynx-cur.orig/configure	2015-05-08 21:54:23.055209047 +0200
-+++ lynx-cur/configure	2015-05-08 21:54:23.051208969 +0200
-@@ -38241,7 +38241,7 @@
- COMPRESS_PROG=
- COMPRESS_EXT=
- if test $use_gzip_help = yes ; then
--	COMPRESS_PROG="$ac_cv_path_GZIP -9"
-+	COMPRESS_PROG="$ac_cv_path_GZIP -9 -n"
- 	COMPRESS_EXT=.gz
- fi
- 
-Index: lynx-cur/configure.in
-===================================================================
---- lynx-cur.orig/configure.in	2015-05-08 21:54:23.055209047 +0200
-+++ lynx-cur/configure.in	2015-05-08 21:54:23.055209047 +0200
-@@ -1463,7 +1463,7 @@
- COMPRESS_PROG=
- COMPRESS_EXT=
- if test $use_gzip_help = yes ; then
--	COMPRESS_PROG="$ac_cv_path_GZIP -9"
-+	COMPRESS_PROG="$ac_cv_path_GZIP -9 -n"
- 	COMPRESS_EXT=.gz
- fi
- AC_SUBST(COMPRESS_PROG)
diff --git a/debian/patches/40_reproducible_build.diff b/debian/patches/40_reproducible_build.diff
deleted file mode 100644
index 67d0b62..0000000
--- a/debian/patches/40_reproducible_build.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Make build reproducible
- - Remove __DATE__ and __TIME__ macros
-   See https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros
- - Sort cfg_defs.h independent of locale
-Author: Axel Beckert <abe at debian.org>
-
-Index: lynx-cur/src/LYMain.c
-===================================================================
---- lynx-cur.orig/src/LYMain.c	2015-02-14 02:35:52.168669038 +0100
-+++ lynx-cur/src/LYMain.c	2015-02-14 02:37:04.970063640 +0100
-@@ -3208,33 +3208,24 @@
-     printf("%s\n", result);
-     free(result);
- 
--#ifndef __DATE__
--#define __DATE__ ""
--#endif
--#ifndef __TIME__
--#define __TIME__ ""
--#endif
--
- /*
-  * SYSTEM_NAME is set by the configure script.  Show build date/time for other
-  * systems, according to predefined compiler symbols.
-  */
- #ifdef SYSTEM_NAME
--    printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
-+    printf(gettext("Built on %s\n"), SYSTEM_NAME);
- #else
- #ifdef __CYGWIN__
--    printf("Compiled by CYGWIN (%s %s).\n", __DATE__, __TIME__);
-+    printf("Compiled by CYGWIN.\n");
- #else
- #ifdef __BORLANDC__
--    printf("Compiled by Borland C++ (%s %s).\n", __DATE__, __TIME__);
-+    printf("Compiled by Borland C++.\n");
- #else
- #ifdef _MSC_VER
--    printf("Compiled by Microsoft Visual C++ (%s %s).\n", __DATE__, __TIME__);
-+    printf("Compiled by Microsoft Visual C++.\n");
- #else
- #ifdef __DJGPP__
--    printf("Compiled by DJGPP (%s %s).\n", __DATE__, __TIME__);
--#else
--    printf("Compiled at (%s %s).\n", __DATE__, __TIME__);
-+    printf("Compiled by DJGPP.\n");
- #endif /* __DJGPP__ */
- #endif /* _MSC_VER */
- #endif /* __BORLANDC__ */
-Index: lynx-cur-2.8.9dev6/scripts/cfg_edit.sh
-===================================================================
---- lynx-cur-2.8.9dev6.orig/scripts/cfg_edit.sh
-+++ lynx-cur-2.8.9dev6/scripts/cfg_edit.sh
-@@ -7,7 +7,7 @@
- # Append a '=' if none present'
- # Break into two strings at '='
- # Prefix ' { "' and suffix '" },'
--sort |
-+LC_ALL=C sort |
- sed	-e 's!^[ 	]*!!' -e 's![ 	]*$!!' \
- 	-e 's!\\!\\\\!g'        \
- 	-e 's!"!\\"!g'          \
diff --git a/debian/patches/add_client_certificate_support.diff b/debian/patches/add_client_certificate_support.diff
deleted file mode 100644
index 1e36e45..0000000
--- a/debian/patches/add_client_certificate_support.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-Description: Add client certificate support
- This feature is neccessary to enable lynx to use Debian SSO
- infrastructure, which now relies on client certificates.
- .
- Currently, client certificates and their corresponding key files
- must be in PEM format.
-Author: Simon Kainz <skainz at debian.org>
-Forwarded: no
-Reviewed-By: Mario Lang <mlang at debian.org>
-Last-Update: 2015-09-03
-
---- lynx-cur-2.8.9dev6.orig/WWW/Library/Implementation/HTTP.c
-+++ lynx-cur-2.8.9dev6/WWW/Library/Implementation/HTTP.c
-@@ -162,6 +162,9 @@ SSL *HTGetSSLHandle(void)
- {
- #ifdef USE_GNUTLS_INCL
-     static char *certfile = NULL;
-+    static char *client_keyfile = NULL;
-+    static char *client_certfile = NULL;
-+    
- #endif
- 
-     if (ssl_ctx == NULL) {
-@@ -204,6 +207,9 @@ SSL *HTGetSSLHandle(void)
- 	}
- #endif
- #ifdef USE_GNUTLS_INCL
-+
-+
-+	
- 	if ((certfile = LYGetEnv("SSL_CERT_FILE")) != NULL) {
- 	    CTRACE((tfp,
- 		    "HTGetSSLHandle: certfile is set to %s by SSL_CERT_FILE\n",
-@@ -225,10 +231,40 @@ SSL *HTGetSSLHandle(void)
- 	}
- #endif
- 	atexit(free_ssl_ctx);
-+
-     }
- #ifdef USE_GNUTLS_INCL
-+
-+
-+	 if (non_empty(SSL_client_key_file))
-+	    {
-+	    client_keyfile=SSL_client_key_file;
-+		CTRACE((tfp,
-+			"HTGetSSLHandle: client key file is set to %s by config SSL_CLIENT_KEY_FILE\n",
-+			client_keyfile));
-+	    }
-+	
-+	
-+
-+	 if (non_empty(SSL_client_cert_file))
-+	    {
-+	    client_certfile=SSL_client_cert_file;
-+		CTRACE((tfp,
-+			"HTGetSSLHandle: client cert file is set to %s by config SSL_CLIENT_CERT_FILE\n",
-+			client_certfile));
-+	    }
-+	
-+	
-+
-+
-+    
-     ssl_ctx->certfile = certfile;
-     ssl_ctx->certfile_type = GNUTLS_X509_FMT_PEM;
-+    ssl_ctx->client_keyfile = client_keyfile;
-+    ssl_ctx->client_keyfile_type = GNUTLS_X509_FMT_PEM;
-+    ssl_ctx->client_certfile = client_certfile;
-+    ssl_ctx->client_certfile_type = GNUTLS_X509_FMT_PEM;
-+
- #endif
-     ssl_okay = 0;
-     return (SSL_new(ssl_ctx));
---- lynx-cur-2.8.9dev6.orig/WWW/Library/Implementation/tidy_tls.h
-+++ lynx-cur-2.8.9dev6/WWW/Library/Implementation/tidy_tls.h
-@@ -78,6 +78,11 @@ typedef struct _SSL_CTX {
-     int (*verify_callback) (int, X509_STORE_CTX *);
-     int verify_mode;
- 
-+    char *client_certfile;
-+    int client_certfile_type;
-+    char *client_keyfile;
-+    int client_keyfile_type;
-+
- } SSL_CTX;
- 
- struct _SSL {
---- lynx-cur-2.8.9dev6.orig/lynx.cfg
-+++ lynx-cur-2.8.9dev6/lynx.cfg
-@@ -3561,6 +3561,20 @@ NESTED_TABLES: false
- SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt
- #SSL_CERT_FILE:NULL
- 
-+.h2 SSL_CLIENT_CERT_FILE
-+# Set SSL_CLIENT_CERT_FILE to the file that contains a client certificate
-+# (in PEM format) in case the $SSL_CLIENT_CERT_FILE environment variable is 
-+# not set, e.g.,
-+#
-+#SSL_CLIENT_CERT_FILE:/home/qux/certs/cert.crt
-+
-+.h2 SSL_CLIENT_KEY_FILE
-+# Set SSL_CLIENT_KEY_FILE to the file that contains a client certificate
-+# key (in PEM format), in case the $SSL_CLIENT_KEY_FILE environment variable 
-+# is not set, e.g.,
-+#
-+#SSL_CLIENT_KEY_FILE:/home/qux/certs/cert.key
-+
- .h1 Appearance
- 
- .h2 SCREEN_SIZE
---- lynx-cur-2.8.9dev6.orig/src/LYGlobalDefs.h
-+++ lynx-cur-2.8.9dev6/src/LYGlobalDefs.h
-@@ -536,6 +536,8 @@ extern "C" {
-     extern int LYHiddenLinks;
- 
-     extern char *SSL_cert_file;	/* Default CA CERT file */
-+    extern char *SSL_client_cert_file;	/* Default client CERT file */
-+    extern char *SSL_client_key_file;	/* Default client key file */
- 
-     extern int Old_DTD;
- 
---- lynx-cur-2.8.9dev6.orig/src/LYMain.c
-+++ lynx-cur-2.8.9dev6/src/LYMain.c
-@@ -553,7 +553,9 @@ char *XLoadImageCommand = NULL;	/* Defau
- BOOLEAN LYNoISMAPifUSEMAP = FALSE;	/* Omit ISMAP link if MAP present? */
- int LYHiddenLinks = HIDDENLINKS_SEPARATE;	/* Show hidden links? */
- 
--char *SSL_cert_file = NULL;	/* Default CA CERT file */
-+char *SSL_cert_file = NULL;	/*y Default CA CERT file */
-+char *SSL_client_cert_file = NULL;
-+char * SSL_client_key_file = NULL;
- 
- int Old_DTD = NO;
- static BOOLEAN DTD_recovery = NO;
-@@ -1579,6 +1581,27 @@ int main(int argc,
-      */
-     read_cfg(lynx_cfg_file, "main program", 1, (FILE *) 0);
- 
-+    static char *client_keyfile = NULL;
-+    static char *client_certfile = NULL;
-+
-+        if ((client_keyfile = LYGetEnv("SSL_CLIENT_KEY_FILE")) != NULL) {
-+            CTRACE((tfp,
-+                    "HTGetSSLHandle: client keyfile is set to %s by SSL_CLIENT_KEY_FILE\n",
-+                    client_keyfile));
-+            StrAllocCopy(SSL_client_key_file,client_keyfile);
-+ 
-+        }
-+ 
-+        if ((client_certfile = LYGetEnv("SSL_CLIENT_CERT_FILE")) != NULL) {
-+            CTRACE((tfp,
-+                    "HTGetSSLHandle: client certfile is set to %s by SSL_CLIENT_CERT_FILE\n",
-+                    client_certfile));
-+            StrAllocCopy(SSL_client_cert_file,client_certfile);
-+        }
-+
-+
-+
-+
- #if defined(USE_COLOR_STYLE)
-     if (!dump_output_immediately) {
- 	init_color_styles(&lynx_lss_file2, default_color_styles);
---- lynx-cur-2.8.9dev6.orig/src/LYOptions.c
-+++ lynx-cur-2.8.9dev6/src/LYOptions.c
-@@ -2444,6 +2444,9 @@ static const char *preferred_doc_lang_st
- static const char *send_user_agent_string = RC_SEND_USERAGENT;
- static const char *user_agent_string = RC_USERAGENT;
- 
-+static const char *ssl_client_certificate_file = RC_SSL_CLIENT_CERT_FILE;
-+static const char *ssl_client_key_file = RC_SSL_CLIENT_KEY_FILE;
-+
- #define PutHeader(fp, Name) \
- 	fprintf(fp, "\n%s<em>%s</em>\n", MARGIN_STR, LYEntifyTitle(&buffer, Name));
- 
-@@ -3260,6 +3263,18 @@ int postoptions(DocInfo *newdoc)
- 	    LYSendUserAgent = (BOOLEAN) !strcasecomp(data[i].value, "ON");
- 	}
- 
-+	if (!strcmp(data[i].tag,ssl_client_certificate_file))
-+	    {
-+	    FREE(SSL_client_cert_file);
-+	    StrAllocCopy(SSL_client_cert_file,data[i].value);
-+	    }
-+
-+	if (!strcmp(data[i].tag,ssl_client_key_file))
-+	    {
-+	    FREE(SSL_client_key_file);
-+	    StrAllocCopy(SSL_client_key_file,data[i].value);
-+	    }
-+
- 	/* User Agent: INPUT */
- 	if (!strcmp(data[i].tag, user_agent_string) && (!no_useragent)) {
- 	    if (strcmp(LYUserAgent, data[i].value)) {
-@@ -3729,6 +3744,15 @@ static int gen_options(char **newfile)
-     BeginSelect(fp0, ssl_prompt_string);
-     PutOptValues(fp0, ssl_noprompt, prompt_values);
-     EndSelect(fp0);
-+    
-+    PutLabel(fp0, gettext("SSL client certificate file"), ssl_client_certificate_file);
-+    PutTextInput(fp0, ssl_client_certificate_file,
-+    NonNull(SSL_client_cert_file), text_len, "");
-+
-+    PutLabel(fp0, gettext("SSL client key file"), ssl_client_key_file);
-+    PutTextInput(fp0, ssl_client_key_file,
-+    NonNull(SSL_client_key_file), text_len, "");
-+    
- #endif
- 
-     PutHeader(fp0, gettext("Keyboard Input"));
---- lynx-cur-2.8.9dev6.orig/src/LYReadCFG.c
-+++ lynx-cur-2.8.9dev6/src/LYReadCFG.c
-@@ -1719,6 +1719,8 @@ static Config_Type Config_Table [] =
-      PARSE_ENU(RC_SOURCE_CACHE_FOR_ABORTED, LYCacheSourceForAborted, tbl_abort_source_cache),
- #endif
-      PARSE_STR(RC_SSL_CERT_FILE,        SSL_cert_file),
-+     PARSE_STR(RC_SSL_CLIENT_CERT_FILE,        SSL_client_cert_file),
-+     PARSE_STR(RC_SSL_CLIENT_KEY_FILE,        SSL_client_key_file),
-      PARSE_FUN(RC_STARTFILE,            startfile_fun),
-      PARSE_FUN(RC_STATUS_BUFFER_SIZE,   status_buffer_size_fun),
-      PARSE_SET(RC_STRIP_DOTDOT_URLS,    LYStripDotDotURLs),
---- lynx-cur-2.8.9dev6.orig/src/LYrcFile.h
-+++ lynx-cur-2.8.9dev6/src/LYrcFile.h
-@@ -234,6 +234,8 @@
- #define RC_SOURCE_CACHE                 "source_cache"
- #define RC_SOURCE_CACHE_FOR_ABORTED     "source_cache_for_aborted"
- #define RC_SSL_CERT_FILE                "ssl_cert_file"
-+#define RC_SSL_CLIENT_CERT_FILE         "ssl_client_cert_file"
-+#define RC_SSL_CLIENT_KEY_FILE          "ssl_client_key_file"
- #define RC_STARTFILE                    "startfile"
- #define RC_STATUS_BUFFER_SIZE           "status_buffer_size"
- #define RC_STRIP_DOTDOT_URLS            "strip_dotdot_urls"
---- lynx-cur-2.8.9dev6.orig/src/tidy_tls.c
-+++ lynx-cur-2.8.9dev6/src/tidy_tls.c
-@@ -549,11 +549,11 @@ SSL *SSL_new(SSL_CTX * ctx)
- 		gnutls_certificate_set_x509_trust_file(ssl->gnutls_cred,
- 						       ctx->certfile,
- 						       ctx->certfile_type);
--	    if (ctx->keyfile)
-+	    if (ctx->client_keyfile)
- 		gnutls_certificate_set_x509_key_file(ssl->gnutls_cred,
--						     ctx->certfile,
--						     ctx->keyfile,
--						     ctx->keyfile_type);
-+						     ctx->client_certfile,
-+						     ctx->client_keyfile,
-+						     ctx->client_keyfile_type);
- 	    ssl->verify_mode = ctx->verify_mode;
- 	    ssl->verify_callback = ctx->verify_callback;
- 
-
diff --git a/debian/patches/fix-typos.diff b/debian/patches/fix-typos.diff
deleted file mode 100644
index 155152c..0000000
--- a/debian/patches/fix-typos.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: fix typos found by lintian
-Author: Axel Beckert <abe at debian.org>
-Forwarded: yes
-
-Index: lynx-cur/CHANGES
-===================================================================
---- lynx-cur.orig/CHANGES	2015-11-28 15:20:48.000000000 +0100
-+++ lynx-cur/CHANGES	2015-11-28 15:21:35.412772538 +0100
-@@ -4218,7 +4218,7 @@
-   not needed or wanted) -Victor Schneider
- * fix Debian bug #65151:  "<> in javascript causes premature </script>"
-   (reported by H Nanosecond <aldomel at ix.netcom.com>) -KW
--* replaced all occurences of 'black' with 'default' in /samples/mild-colors.lss
-+* replaced all occurrences of 'black' with 'default' in /samples/mild-colors.lss
-   to make it more reasonable on terminals with non-black background -VH
- * modify color-style initialization to avoid passing -1's as attribute codes
-   which would happen if the lynx.lss file was not found, or if not all styles
-Index: lynx-cur/src/LYKeymap.c
-===================================================================
---- lynx-cur.orig/src/LYKeymap.c	2015-11-28 15:20:48.000000000 +0100
-+++ lynx-cur/src/LYKeymap.c	2015-11-28 15:21:41.052756205 +0100
-@@ -424,10 +424,10 @@
- 	    "search within the current document"),
-     DATA(
- 	    LYK_PREV, "PREV",
--	    "search for the previous occurence"),
-+	    "search for the previous occurrence"),
-     DATA(
- 	    LYK_NEXT, "NEXT",
--	    "search for the next occurence"),
-+	    "search for the next occurrence"),
-     DATA(
- 	    LYK_COMMENT, "COMMENT",
- 	    "send a comment to the author of the current document"),
diff --git a/debian/patches/gnutls_add_rehandshake_support.diff b/debian/patches/gnutls_add_rehandshake_support.diff
deleted file mode 100644
index a0047d0..0000000
--- a/debian/patches/gnutls_add_rehandshake_support.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Add support for GNUTLS rehandshake
-Author: Simon Kainz <skainz at debian.org>
-Bug-Debian: https://bugs.debian.org/797059
-Forwarded: http://permalink.gmane.org/gmane.comp.web.lynx.devel/8455
-
---- lynx-cur-2.8.9dev6.orig/WWW/Library/Implementation/tidy_tls.h
-+++ lynx-cur-2.8.9dev6/WWW/Library/Implementation/tidy_tls.h
-@@ -98,6 +98,9 @@ struct _SSL {
- 
-     gnutls_transport_ptr_t rfd;
-     gnutls_transport_ptr_t wfd;
-+    
-+    void *sendbuffer;
-+    int bytes_sent;
- };
- 
- /* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
---- lynx-cur-2.8.9dev6.orig/src/tidy_tls.c
-+++ lynx-cur-2.8.9dev6/src/tidy_tls.c
-@@ -530,7 +530,6 @@ SSL *SSL_new(SSL_CTX * ctx)
- {
-     SSL *ssl;
-     int rc;
--
-     if ((ssl = typeCalloc(SSL)) != 0) {
- 
- 	rc = gnutls_certificate_allocate_credentials(&ssl->gnutls_cred);
-@@ -564,6 +563,9 @@ SSL *SSL_new(SSL_CTX * ctx)
- 	    ssl->wfd = (gnutls_transport_ptr_t) (-1);
- 	}
-     }
-+    ssl->bytes_sent=0;
-+    ssl->sendbuffer=0;
-+
-     return ssl;
- }
- 
-@@ -576,13 +578,22 @@ int SSL_read(SSL * ssl, void *buffer, in
-     int rc;
- 
-     rc = gnutls_record_recv(ssl->gnutls_state, buffer, length);
--    ssl->last_error = rc;
- 
-+    if ( rc <0 && gnutls_error_is_fatal(rc) == 0) {
-+      if (rc == GNUTLS_E_REHANDSHAKE ) {
-+	rc=gnutls_handshake(ssl->gnutls_state);
-+	gnutls_record_send(ssl->gnutls_state,ssl->sendbuffer,ssl->bytes_sent);
-+	rc = gnutls_record_recv(ssl->gnutls_state, buffer, length);
-+      }
-+    }
-+    
-+    ssl->last_error = rc;
-+    
-     if (rc < 0) {
--	last_error = rc;
--	rc = 0;
-+      last_error = rc;
-+      rc = 0;
-     }
--
-+    
-     return rc;
- }
- 
-@@ -611,6 +622,15 @@ int SSL_write(SSL * ssl, const void *buf
- 	last_error = rc;
- 	rc = 0;
-     }
-+    else {
-+      if (ssl->sendbuffer)
-+	{
-+	  free(ssl->sendbuffer);
-+	}
-+         ssl->sendbuffer=malloc(rc);
-+      ssl->bytes_sent=rc;
-+    }
-+    
- 
-     return rc;
- }
diff --git a/debian/patches/gnutls_set_default_priority.diff b/debian/patches/gnutls_set_default_priority.diff
deleted file mode 100644
index fe9d112..0000000
--- a/debian/patches/gnutls_set_default_priority.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Use gnutls_set_default_priority() instead of a custom
- priority string.
- This is a minimal patch, leaving the now unused functions alone.
-Author: Andreas Metzler <ametzler at debian.org>
-Origin: vendor
-Forwarded: http://mid.gmane.org/20150512175429.GB1321%40downhill.g.la
-Last-Update: 2015-05-13
-Bug-Debian: http://bugs.debian.org/784430
-
-diff --git a/src/tidy_tls.c b/src/tidy_tls.c
-index f6dea81..df8efb4 100644
---- a/src/tidy_tls.c
-+++ b/src/tidy_tls.c
-@@ -542,21 +542,7 @@ SSL *SSL_new(SSL_CTX * ctx)
- 	    ssl->ctx = ctx;
- 
- 	    gnutls_init(&ssl->gnutls_state, ctx->method->connend);
--
--#if USE_SET_DIRECT
--	    UpdatePriority(ssl);
--#else
--	    gnutls_protocol_set_priority(ssl->gnutls_state,
--					 ctx->method->priority.protocol);
--	    gnutls_cipher_set_priority(ssl->gnutls_state,
--				       ctx->method->priority.encrypts);
--	    gnutls_compression_set_priority(ssl->gnutls_state,
--					    ctx->method->priority.compress);
--	    gnutls_kx_set_priority(ssl->gnutls_state,
--				   ctx->method->priority.key_xchg);
--	    gnutls_mac_set_priority(ssl->gnutls_state,
--				    ctx->method->priority.msg_code);
--#endif
-+	    gnutls_set_default_priority(ssl->gnutls_state);
- 
- 	    gnutls_credentials_set(ssl->gnutls_state, GNUTLS_CRD_CERTIFICATE,
- 				   ssl->gnutls_cred);
diff --git a/debian/patches/lynxcfg.patch b/debian/patches/lynxcfg.patch
index c7a5a65..731bcf3 100644
--- a/debian/patches/lynxcfg.patch
+++ b/debian/patches/lynxcfg.patch
@@ -8,8 +8,8 @@ Forwarded: not-needed
  #
  # Normally we expect you will connect to a remote site, e.g., the Lynx starting
  # site:
--STARTFILE:http://lynx.isc.org/
-+#STARTFILE:http://lynx.isc.org/
+-STARTFILE:http://lynx.invisible-island.net/
++#STARTFILE:http://lynx.invisible-island.net/
  #
  # As an alternative, you may want to use a local URL.  A good choice for this is
  # the user's home directory:
@@ -17,8 +17,8 @@ Forwarded: not-needed
  # This definition will be overridden if the "LYNX_HELPFILE" environment
  # variable has been set.
  #
--HELPFILE:http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
-+#HELPFILE:http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
+-HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
++#HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
  .ex
 -#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 +##HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
@@ -167,7 +167,7 @@ Forwarded: not-needed
  
  .h2 PREFERRED_MEDIA_TYPES
  # When doing a GET, lynx lists the MIME types which it knows how to present
-@@ -3554,7 +3558,7 @@
+@@ -3555,7 +3559,7 @@
  # should accept, in case the $SSL_CERT_FILE environment variable is not set,
  # e.g.,
  #
@@ -175,8 +175,8 @@ Forwarded: not-needed
 +SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt
  #SSL_CERT_FILE:NULL
  
- .h1 Appearance
-@@ -3578,7 +3582,7 @@
+ .h2 SSL_CLIENT_CERT_FILE
+@@ -3595,7 +3599,7 @@
  
  .h2 SYSLOG_REQUESTED_URLS
  # Log the requested URLs using the syslog interface.
@@ -185,10 +185,18 @@ Forwarded: not-needed
  
  .h2 SYSLOG_TEXT
  # Add the given text to calls made to syslog, to distinguish Lynx from other
-@@ -3744,3 +3748,19 @@
+@@ -3761,11 +3765,27 @@
  .h2 WITH_BACKSPACES
  # Emit backspaces in output if -dump'ing or -crawl'ing (like 'man' does).
  #WITH_BACKSPACES:FALSE
+ 
+ .h1 Internal Behavior
+ .h2 HTTP_PROTOCOL
+ # Normally Lynx negotiates HTTP/1.0, because it does not support chunked
+ # transfer (a requirement for all HTTP/1.1 clients), although it supports
+ # several other features of HTTP/1.1.  You may encounter a server which does
+ # not support HTTP/1.0 which can be used by switching to the later protocol.
+ #HTTP_PROTOCOL:1.0
 +
 +# external
 +EXTERNAL:ftp:w3m %s:TRUE
diff --git a/debian/patches/manpage_improved.patch b/debian/patches/manpage_improved.patch
deleted file mode 100644
index fc41416..0000000
--- a/debian/patches/manpage_improved.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Improve manpage, add Delete key usage
-Author: Denis Briand <debian at denis-briand.fr>
-Bug-Debian: http://bugs.debian.org/74358
-
-==============================================================
---- a/lynx.man
-+++ b/lynx.man
-@@ -963,6 +963,9 @@ of key-stroke commands.
- .B o
- Type \*(``\fBK\fR\*('' for a complete list of the current key-stroke
- command mappings.
-+.TP
-+.B o
-+Type \fBDelete\fR to view history list.
- .SH ENVIRONMENT
- In addition to various \*(``standard\*('' environment variables such as
- \fBHOME\fR, \fBPATH\fR, \fBUSER\fR, \fBDISPLAY\fR, \fBTMPDIR\fR, \fBetc\fR,
diff --git a/debian/patches/series b/debian/patches/series
index e58cd9f..7317b0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,4 @@
 lynxcfg.patch
 aboutlynx.patch
-use-dpkg-buildflags.patch
-20_use_gzip-n.diff
 21_do_not_strip_-g.diff
-40_reproducible_build.diff
 nested_tables.patch
-manpage_improved.patch
-gnutls_set_default_priority.diff
-gnutls_add_rehandshake_support.diff
-add_client_certificate_support.diff
-fix-typos.diff
diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch
deleted file mode 100644
index 154d336..0000000
--- a/debian/patches/use-dpkg-buildflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use build flags from environment (dpkg-buildflags).
- Necessary for hardening flags.
- .
- *_BUILD flags don't contain the flags from the environment, but only local
- additions.
-Author: Atsuhito Kohda <kohda at debian.org>
-
-Index: lynx-cur-2.8.8dev.12/src/chrtrans/makefile.in
-===================================================================
---- lynx-cur-2.8.8dev.12.orig/src/chrtrans/makefile.in	2012-03-19 16:50:15.072775970 +0100
-+++ lynx-cur-2.8.8dev.12/src/chrtrans/makefile.in	2012-03-19 16:51:46.744779460 +0100
-@@ -123,7 +123,7 @@
- C_SRC		= $(OBJS:$o=.c)
- 
- $(MAKEUCTB) : $(OBJS)
--	$(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
-+	$(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
- 
- makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
- 
diff --git a/debian/rules b/debian/rules
index 3612909..773ad42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND := -Wall
+export DEB_CFLAGS_MAINT_APPEND := -Wall -DNO_BUILDSTAMP
 
 SSL=gnu
 # uncomment the next line if you want openssl version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git

More information about the pkg-lynx-commits mailing list