[Pkg-wmaker-commits] [wmbiff] 77/92: debian/patches: Remove directory; patches applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbiff.
commit 974db9542d1701810f39f532a1b766667a8fca5c
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Nov 8 16:31:02 2014 -0600
debian/patches: Remove directory; patches applied upstream.
---
debian/patches/15_no_more_LZO.diff | 34 ------
debian/patches/fix_deprecated_gnutls_types.diff | 153 ------------------------
debian/patches/fix_manpage.diff | 107 -----------------
debian/patches/fix_pointer_cast.diff | 34 ------
debian/patches/series | 5 -
debian/patches/update_autotools.diff | 20 ----
6 files changed, 353 deletions(-)
diff --git a/debian/patches/15_no_more_LZO.diff b/debian/patches/15_no_more_LZO.diff
deleted file mode 100644
index b06fbfc..0000000
--- a/debian/patches/15_no_more_LZO.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: gnutls support for LZO compression (and gnutls extra) was
- removed upstream, stop trying to use it.
-Author: Andreas Metzler <ametzler at debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/638736
-Last-Update: 2014-08-09
-
---- a/wmbiff/gnutls-common.c
-+++ b/wmbiff/gnutls-common.c
-@@ -4,7 +4,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <gnutls/gnutls.h>
--#include <gnutls/extra.h>
- #include <gnutls/x509.h>
- #include <gnutls/openpgp.h>
- #include <time.h>
-@@ -513,7 +512,6 @@
-
- printf("Compression methods:");
- printf(" ZLIB");
-- printf(", LZO");
- printf(", NULL\n");
- }
-
-@@ -641,8 +639,6 @@
- comp_priority[j++] = GNUTLS_COMP_NULL;
- if (strncasecmp(comp[i], "ZLI", 3) == 0)
- comp_priority[j++] = GNUTLS_COMP_ZLIB;
-- if (strncasecmp(comp[i], "LZO", 3) == 0)
-- comp_priority[j++] = GNUTLS_COMP_LZO;
- }
- comp_priority[j] = 0;
- }
diff --git a/debian/patches/fix_deprecated_gnutls_types.diff b/debian/patches/fix_deprecated_gnutls_types.diff
deleted file mode 100644
index 0186d7a..0000000
--- a/debian/patches/fix_deprecated_gnutls_types.diff
+++ /dev/null
@@ -1,153 +0,0 @@
-Description: Fix deprecated gnutls types
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-11-05
-
---- a/wmbiff/gnutls-common.h
-+++ b/wmbiff/gnutls-common.h
-@@ -25,8 +25,8 @@
-
- extern const char str_unknown[];
-
--int print_info( gnutls_session state, const char* hostname);
--void print_cert_info( gnutls_session state, const char* hostname);
-+int print_info( gnutls_session_t state, const char* hostname);
-+void print_cert_info( gnutls_session_t state, const char* hostname);
- void print_list(void);
-
- void parse_comp( char** comp, int ncomp, int* comp_priority);
---- a/wmbiff/tlsComm.c
-+++ b/wmbiff/tlsComm.c
-@@ -58,8 +58,8 @@
- int sd;
- char *name;
- #ifdef USE_GNUTLS
-- gnutls_session tls_state;
-- gnutls_certificate_credentials xcred;
-+ gnutls_session_t tls_state;
-+ gnutls_certificate_credentials_t xcred;
- #else
- /*@null@ */ void *tls_state;
- /*@null@ */ void *xcred;
-@@ -364,13 +364,13 @@
- #define CERT_SEP "-----BEGIN"
-
- /* this bit is based on read_ca_file() in gnutls */
--static int tls_compare_certificates(const gnutls_datum * peercert)
-+static int tls_compare_certificates(const gnutls_datum_t * peercert)
- {
-- gnutls_datum cert;
-+ gnutls_datum_t cert;
- unsigned char *ptr;
- FILE *fd1;
- int ret;
-- gnutls_datum b64_data;
-+ gnutls_datum_t b64_data;
- unsigned char *b64_data_data;
- struct stat filestat;
-
-@@ -427,9 +427,9 @@
- {
- int ret;
- unsigned int certstat;
-- const gnutls_datum *cert_list;
-+ const gnutls_datum_t *cert_list;
- unsigned int cert_list_size = 0;
-- gnutls_x509_crt cert;
-+ gnutls_x509_crt_t cert;
-
- if (gnutls_auth_get_type(scs->tls_state) != GNUTLS_CRD_CERTIFICATE) {
- bad_certificate(scs, "Unable to get certificate from peer.\n");
-@@ -598,7 +598,7 @@
- gnutls_cred_set(scs->tls_state, GNUTLS_CRD_CERTIFICATE,
- scs->xcred);
- gnutls_transport_set_ptr(scs->tls_state,
-- (gnutls_transport_ptr) sd);
-+ (gnutls_transport_ptr_t) sd);
- do {
- zok = gnutls_handshake(scs->tls_state);
- }
---- a/wmbiff/gnutls-common.c
-+++ b/wmbiff/gnutls-common.c
-@@ -34,10 +34,10 @@
-
- }
-
--void print_x509_info(gnutls_session session, const char* hostname)
-+void print_x509_info(gnutls_session_t session, const char* hostname)
- {
-- gnutls_x509_crt crt;
-- const gnutls_datum *cert_list;
-+ gnutls_x509_crt_t crt;
-+ const gnutls_datum_t *cert_list;
- unsigned int cert_list_size = 0;
- int ret;
- char digest[20];
-@@ -107,7 +107,7 @@
-
- if (xml) {
- #ifdef ENABLE_PKI
-- gnutls_datum xml_data;
-+ gnutls_datum_t xml_data;
-
- ret = gnutls_x509_crt_to_xml( crt, &xml_data, 0);
- if (ret < 0) {
-@@ -200,7 +200,7 @@
-
- #ifdef HAVE_LIBOPENCDK
-
--void print_openpgp_info(gnutls_session session, const char* hostname)
-+void print_openpgp_info(gnutls_session_t session, const char* hostname)
- {
-
- char digest[20];
-@@ -212,7 +212,7 @@
- char name[256];
- size_t name_len = sizeof(name);
- gnutls_openpgp_key crt;
-- const gnutls_datum *cert_list;
-+ const gnutls_datum_t *cert_list;
- unsigned int cert_list_size = 0;
- time_t expiret;
- time_t activet;
-@@ -259,7 +259,7 @@
- }
-
- if (xml) {
-- gnutls_datum xml_data;
-+ gnutls_datum_t xml_data;
-
- ret = gnutls_openpgp_key_to_xml( crt, &xml_data, 0);
- if (ret < 0) {
-@@ -332,7 +332,7 @@
-
- #endif
-
--void print_cert_vrfy(gnutls_session session)
-+void print_cert_vrfy(gnutls_session_t session)
- {
-
- unsigned int status;
-@@ -369,11 +369,11 @@
- }
- }
-
--int print_info(gnutls_session session, const char* hostname)
-+int print_info(gnutls_session_t session, const char* hostname)
- {
- const char *tmp;
-- gnutls_credentials_type cred;
-- gnutls_kx_algorithm kx;
-+ gnutls_credentials_type_t cred;
-+ gnutls_kx_algorithm_t kx;
-
-
- /* print the key exchange's algorithm name
-@@ -454,7 +454,7 @@
- return 0;
- }
-
--void print_cert_info(gnutls_session session, const char* hostname)
-+void print_cert_info(gnutls_session_t session, const char* hostname)
- {
-
- printf("- Certificate type: ");
diff --git a/debian/patches/fix_manpage.diff b/debian/patches/fix_manpage.diff
deleted file mode 100644
index 605907f..0000000
--- a/debian/patches/fix_manpage.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Fix manpages.
- In particular, fix spelling-error-in-manpage, hyphen-used-as-minus-sign,
- and manpage-has-errors-from-man Lintian warnings.
-Author: Doug Torrance
-Last-Update: 2014-11-05
-
---- a/wmbiff/wmbiffrc.5.in
-+++ b/wmbiff/wmbiffrc.5.in
-@@ -24,7 +24,7 @@
- .SH OPTIONS
- Each option takes the form
- .IR option[.mbox] " = " value .
--Comments must be preceeded by pound signs (#).
-+Comments must be preceded by pound signs (#).
-
- The supported configuration options are:
-
-@@ -49,7 +49,7 @@
- is: \fINORMAL\fP.
-
- gnutls predefined values:
--.SP
-+.sp
- .RS 8
- \fIPERFORMANCE\fP (gnutls >= 2.2.0)
- .RE
-@@ -97,7 +97,7 @@
- pixmap file.
- .TP
- \fBglobalnotify\fP
--Command to be executed when new mail is recieved in any mailbox. Set
-+Command to be executed when new mail is received in any mailbox. Set
- notify.n to override this option for mailbox n.
- .TP
- \fBlabel.n\fP
-@@ -237,7 +237,7 @@
- checkings, default is the global interval.
- .TP
- \fBfetchinterval.n\fP
--Interval between mail auto-fetching. Values accept 0 to disable, -1 for
-+Interval between mail auto-fetching. Values accept 0 to disable, \-1 for
- autofetching on new mail arrival, and positive values for a given interval
- in seconds.
- .TP
-@@ -299,12 +299,12 @@
- failures. Some servers claim to support cram-md5 but fail:
- telling wmbiff not to try can help.
-
--For other problems, run wmbiff with the -debug option. See
-+For other problems, run wmbiff with the \-debug option. See
- wmbiff(1) for details.
-
- While editing .wmbiffrc, you may find it useful to restart
- wmbiff using either control-shift mouse button 1, or killall
---USR1 wmbiff.
-+\-USR1 wmbiff.
-
-
- .SH FILES
---- a/wmbiff/wmbiff.1
-+++ b/wmbiff/wmbiff.1
-@@ -13,7 +13,7 @@
-
- .SH SYNOPSIS
- .B wmbiff
--[-display <display name>] [-geometry +XPOS+YPOS] [-c <filename>] [-h] [-v] [-debug] [-fg <foreground-color>] [-bg <background-color>] [-hi <highlight-color>] [-font <X11 font>|default] [-o] [+w]
-+[\-display <display name>] [\-geometry +XPOS+YPOS] [\-c <filename>] [\-h] [\-v] [\-debug] [\-fg <foreground-color>] [\-bg <background-color>] [\-hi <highlight-color>] [\-font <X11 font>|default] [\-o] [+w]
- .br
-
- .SH DESCRIPTION
-@@ -60,15 +60,15 @@
- Print verbose log of progress.
- .TP
- .B \-fg <color>
--Use specified X11 color for foreground. Implies -font default,
-+Use specified X11 color for foreground. Implies \-font default,
- unless overridden.
- .TP
- .B \-bg <color>
--Use specified X11 color for background. Implies -font default,
-+Use specified X11 color for background. Implies \-font default,
- unless overridden.
- .TP
- .B \-hi <color>
--Use specified X11 color for new mail counters. Implies -font
-+Use specified X11 color for new mail counters. Implies \-font
- default, unless overridden.
- .TP
- .B \-font <font>
-@@ -97,7 +97,7 @@
- Do not use the "withdrawn" state: the wmbiff window will not
- be captured as an icon and placed in the dock, but will
- instead have its own window. This option starts with a '+'
--for consistency with other software programs: many use '-w'
-+for consistency with other software programs: many use '\-w'
- to mean the opposite.
-
- .SH BUGS
-@@ -105,7 +105,7 @@
- Mailing List <wmbiff-devel at lists.sourceforge.net>. Consider
- attaching a transcript of your session, generated using:
- .RS
--wmbiff -debug | tee wmbiff-log
-+wmbiff \-debug | tee wmbiff-log
- .RE
- Be sure to remove any instances of your password.
-
diff --git a/debian/patches/fix_pointer_cast.diff b/debian/patches/fix_pointer_cast.diff
deleted file mode 100644
index 166119c..0000000
--- a/debian/patches/fix_pointer_cast.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix cast to pointer from integer of different size warning.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-11-05
-
---- a/wmbiff/tlsComm.c
-+++ b/wmbiff/tlsComm.c
-@@ -539,7 +539,7 @@
- return;
- }
-
--struct connection_state *initialize_gnutls(int sd, char *name, Pop3 pc,
-+struct connection_state *initialize_gnutls(intptr_t sd, char *name, Pop3 pc,
- const char *remote_hostname)
- {
- static int gnutls_initialized;
---- a/wmbiff/tlsComm.h
-+++ b/wmbiff/tlsComm.h
-@@ -9,6 +9,7 @@
- */
-
- /* used to drill through per-mailbox debug keys */
-+#include <stdint.h>
- #include "Client.h"
-
- /* opaque reference to the state associated with a
-@@ -19,7 +20,7 @@
- /* take a socket descriptor and negotiate a TLS connection
- over it */
- /*@only@*/
--struct connection_state *initialize_gnutls(int sd, /*@only@ */ char *name,
-+struct connection_state *initialize_gnutls(intptr_t sd, /*@only@ */ char *name,
- Pop3 pc, const char *hostname);
-
- /* take a socket descriptor and bundle it into a connection
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e141a48..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-15_no_more_LZO.diff
-update_autotools.diff
-fix_manpage.diff
-fix_deprecated_gnutls_types.diff
-fix_pointer_cast.diff
diff --git a/debian/patches/update_autotools.diff b/debian/patches/update_autotools.diff
deleted file mode 100644
index ebb4d3e..0000000
--- a/debian/patches/update_autotools.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Update autotools
- In particular, avoid the following warning:
- configure.ac:11: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms
- are deprecated. For more info, see:
- configure.ac:11: http://www.gnu.org/software/automake/manual/automake.html
- #Modernize-AM_005fINIT_005fAUTOMAKE-invocation
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-11-05
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@
-
- AC_INIT(WMBiff, 0.4.27, wmbiff-devel at lists.sourceforge.net, wmbiff)
- AC_CONFIG_AUX_DIR(autoconf)
--AM_INIT_AUTOMAKE(wmbiff, 0.4.27) dnl tarded syntax for automake <= 1.5
-+AM_INIT_AUTOMAKE
- AC_CONFIG_HEADER([config.h])
- dnl make sure autoheader finds version, implicitly defined above.
- AH_TEMPLATE([VERSION], [wmbiff's release version])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list