* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmbiff/files/
@ 2017-02-18 22:09 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-02-18 22:09 UTC (permalink / raw
To: gentoo-commits
commit: dbc1cc5b4c651668097c8271ade24b1c6af25643
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 18 15:42:29 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:07:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc1cc5b
x11-plugins/wmbiff: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/4014
.../wmbiff/files/wmbiff-0.4.27-gnutls-3.patch | 60 ----------------------
.../wmbiff/files/wmbiff-0.4.27-gnutls.patch | 26 ----------
2 files changed, 86 deletions(-)
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch
deleted file mode 100644
index d68512450f..0000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur wmbiff-0.4.27.orig/wmbiff/gnutls-common.c wmbiff-0.4.27/wmbiff/gnutls-common.c
---- wmbiff-0.4.27.orig/wmbiff/gnutls-common.c 2012-07-04 21:45:00.013010829 +0200
-+++ wmbiff-0.4.27/wmbiff/gnutls-common.c 2012-07-04 21:48:39.306250592 +0200
-@@ -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>
-@@ -335,8 +334,8 @@
- void print_cert_vrfy(gnutls_session session)
- {
-
-- int status;
-- status = gnutls_certificate_verify_peers(session);
-+ int verify_ret, status;
-+ verify_ret = gnutls_certificate_verify_peers2(session, &status);
- printf("\n");
-
- if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
-@@ -509,7 +508,6 @@
-
- printf("Compression methods:");
- printf(" ZLIB");
-- printf(", LZO");
- printf(", NULL\n");
- }
-
-@@ -637,8 +635,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 -Naur wmbiff-0.4.27.orig/wmbiff/tlsComm.c wmbiff-0.4.27/wmbiff/tlsComm.c
---- wmbiff-0.4.27.orig/wmbiff/tlsComm.c 2012-07-04 21:45:00.013010829 +0200
-+++ wmbiff-0.4.27/wmbiff/tlsComm.c 2012-07-04 21:50:27.897367863 +0200
-@@ -410,7 +410,7 @@
- tls_check_certificate(struct connection_state *scs,
- const char *remote_hostname)
- {
-- int certstat;
-+ int verify_ret, certstat;
- const gnutls_datum *cert_list;
- int cert_list_size = 0;
- gnutls_x509_crt cert;
-@@ -419,7 +419,7 @@
- bad_certificate(scs, "Unable to get certificate from peer.\n");
- return; /* bad_cert will exit if -skip-certificate-check was not given */
- }
-- certstat = gnutls_certificate_verify_peers(scs->tls_state);
-+ verify_ret = gnutls_certificate_verify_peers2(scs->tls_state, &certstat);
- if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) {
- bad_certificate(scs, "server presented no certificate.\n");
- #ifdef GNUTLS_CERT_CORRUPTED
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch
deleted file mode 100644
index 738d8f160a..0000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.gentoo.org/268502
-
---- configure.ac
-+++ configure.ac
-@@ -77,13 +77,14 @@
-
- GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
- if test "$gnutls" = "ok"; then
-- AM_PATH_LIBGNUTLS(1.0.4, [LIBS="$LIBS $LIBGNUTLS_LIBS"
-- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
-- GNUTLS_COMMON_O="gnutls-common.o"
-- GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS."
-- AC_CHECK_HEADERS(gnutls/gnutls.h) ],
-- [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ])
-+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.4],
-+ [LIBS="$LIBS $LIBGNUTLS_LIBS"
-+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+ CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
-+ GNUTLS_COMMON_O="gnutls-common.o"
-+ GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS."
-+ AC_CHECK_HEADERS(gnutls/gnutls.h) ],
-+ [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ])
- else
- AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled)
- fi
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmbiff/files/
@ 2021-01-25 11:10 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2021-01-25 11:10 UTC (permalink / raw
To: gentoo-commits
commit: b1ea257ca6965014ddd60831bf4267fe167fd412
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 09:25:43 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 11:09:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ea257c
x11-plugins/wmbiff: remove unused patch
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19207
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../wmbiff/files/wmbiff-0.4.35-fno-common.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
deleted file mode 100644
index 2320f17143d..00000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur wmbiff-0.4.35.orig/wmbiff/wmbiff.c wmbiff-0.4.35/wmbiff/wmbiff.c
---- wmbiff-0.4.35.orig/wmbiff/wmbiff.c 2019-07-23 15:58:58.000000000 +0200
-+++ wmbiff-0.4.35/wmbiff/wmbiff.c 2020-03-08 12:25:32.766264038 +0100
-@@ -104,6 +104,8 @@
-
- Cursor busy_cursor, ready_cursor;
-
-+Display *display;
-+
- static __inline /*@out@ */ void *
- malloc_ordie(size_t len)
- {
-diff -Naur wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h wmbiff-0.4.35/wmgeneral/wmgeneral.h
---- wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h 2019-07-23 15:57:57.000000000 +0200
-+++ wmbiff-0.4.35/wmgeneral/wmgeneral.h 2020-03-08 12:25:16.223256712 +0100
-@@ -36,7 +36,7 @@
- /* Global variable */
- /*******************/
-
--Display *display;
-+extern Display *display;
-
- /***********************/
- /* Function Prototypes */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-25 11:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-18 22:09 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmbiff/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 11:10 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox