pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases gq: Remove, incompatible with OpenSSL 1.1, d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7cb5aaf4345b
branches:  trunk
changeset: 412717:7cb5aaf4345b
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Mar 11 18:45:51 2020 +0000

description:
gq: Remove, incompatible with OpenSSL 1.1, dead upstream

diffstat:

 databases/Makefile                              |   3 +-
 databases/gq/DESCR                              |  13 -----
 databases/gq/Makefile                           |  27 ----------
 databases/gq/PLIST                              |  12 ----
 databases/gq/distinfo                           |  16 ------
 databases/gq/patches/patch-aa                   |  14 -----
 databases/gq/patches/patch-ab                   |  22 --------
 databases/gq/patches/patch-ac                   |  18 -------
 databases/gq/patches/patch-ad                   |  20 --------
 databases/gq/patches/patch-ae                   |  62 -------------------------
 databases/gq/patches/patch-an                   |  15 ------
 databases/gq/patches/patch-src_Makefile.in      |  15 ------
 databases/gq/patches/patch-src_gq-hash_h        |  15 ------
 databases/gq/patches/patch-src_gq-server-list_h |  15 ------
 databases/gq/patches/patch-src_state_c          |  15 ------
 15 files changed, 1 insertions(+), 281 deletions(-)

diffs (truncated from 352 to 300 lines):

diff -r 70655d0778e8 -r 7cb5aaf4345b databases/Makefile
--- a/databases/Makefile        Wed Mar 11 16:13:35 2020 +0000
+++ b/databases/Makefile        Wed Mar 11 18:45:51 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.592 2020/02/09 21:43:07 jdolecek Exp $
+# $NetBSD: Makefile,v 1.593 2020/03/11 18:45:51 nia Exp $
 
 COMMENT=       Databases
 
@@ -43,7 +43,6 @@
 SUBDIR+=       go-sqlite3
 SUBDIR+=       go-tiedot
 SUBDIR+=       gourmet
-SUBDIR+=       gq
 SUBDIR+=       gramps3
 SUBDIR+=       gramps5
 SUBDIR+=       gtkdbfeditor
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/DESCR
--- a/databases/gq/DESCR        Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-  GQ is a GTK-based LDAP client that enables you to search and browse any LDAP
-V2- or V3-compliant server (OpenLDAP, Novell, Netscape, etc.).  With sufficient
-permissions, you can also add, edit, and delete entries.
-
-  Features include:
-       * LDAP browser
-       * LDAP V3 Schema browser
-       * Template builder
-       * Export subtree or whole server to LDIF
-       * Use any number of servers
-       * Search based on single argument or LDAP filter
-       * Edit and delete entries Add entries using an existing entry,
-         or based on your own template)
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/Makefile
--- a/databases/gq/Makefile     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.88 2020/03/10 22:09:31 wiz Exp $
-
-DISTNAME=      gq-1.2.3
-PKGREVISION=   49
-CATEGORIES=    databases net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gqclient/}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://gq-project.org/
-COMMENT=       GTK-based LDAP client
-LICENSE=       gnu-gpl-v2
-
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake perl pkg-config intltool
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-browser-dnd
-CONFIGURE_ARGS+=       --enable-cache
-CONFIGURE_ARGS+=       --with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
-
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/PLIST
--- a/databases/gq/PLIST        Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:43:15 joerg Exp $
-bin/gq
-share/applications/gq.desktop
-share/gq/gq.glade
-share/mime/packages/gq-ldif.xml
-share/pixmaps/gq/bomb.xpm
-share/pixmaps/gq/entry.png
-share/pixmaps/gq/gq.xpm
-share/pixmaps/gq/hide.xpm
-share/pixmaps/gq/new.xpm
-share/pixmaps/gq/textview.png
-share/pixmaps/gq/warning.xpm
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/distinfo
--- a/databases/gq/distinfo     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:56:12 agc Exp $
-
-SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
-RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
-SHA512 (gq-1.2.3.tar.gz) = d6f5a61585fc98d3a6a57923c412dec952f7886288da008d69e73ab1b2c820461897bf0759a7f14454dc6c450127dc3248b5ae1e4db8004b174ee9be95b387d9
-Size (gq-1.2.3.tar.gz) = 423119 bytes
-SHA1 (patch-aa) = b243ab8d862e1aae6dc3a1e4769faa8e8949efe6
-SHA1 (patch-ab) = aa4918c9ee9900b839c58692e68c4adb675dcb17
-SHA1 (patch-ac) = d2180a16425a672c93c19697d9648e4c552cdcb8
-SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
-SHA1 (patch-ae) = aeda3e38a58b8211b8df2534409d928766078287
-SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
-SHA1 (patch-src_Makefile.in) = 0a210f4550a7d4805d1d351ae67e6459e37cdc37
-SHA1 (patch-src_gq-hash_h) = ad63f914ffabca9f74ef0926727396d1cf699bfd
-SHA1 (patch-src_gq-server-list_h) = fe85a8ae6326bd8ae8da35df5d558f409302be48
-SHA1 (patch-src_state_c) = 6b5fd642fb86498575434b12444c50eb80d5592e
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-aa
--- a/databases/gq/patches/patch-aa     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/01/10 21:42:51 adam Exp $
-
---- config.h.in.orig   2008-01-08 17:41:44.000000000 +0100
-+++ config.h.in
-@@ -53,6 +53,9 @@
- /* Define to 1 if you have the `iswspace' function. */
- #undef HAVE_ISWSPACE
- 
-+/* Define if you have the btowc function.  */
-+#undef HAVE_BTOWC
-+
- /* Define if you have Kerberos installed */
- #undef HAVE_KERBEROS
- 
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-ab
--- a/databases/gq/patches/patch-ab     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/01/10 21:42:51 adam Exp $
-
---- configure.orig     2008-01-08 17:41:30.000000000 +0100
-+++ configure
-@@ -6240,7 +6240,7 @@ fi
- for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
-              ldap_initialize \
-              iswspace snprintf \
--             g_snprintf
-+             g_snprintf btowc
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -7629,7 +7629,7 @@ echo "${ECHO_T}no" >&6; }
- 
- # a backup of the working CFLAGS
- WARN_CFLAGS=""
--for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
-+for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
- do
-       if test -z "`echo "$CFLAGS" | grep -w -- "$A" 2> /dev/null`" ; then
-               gq_cv_compiler_supports_flag "$A"
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-ac
--- a/databases/gq/patches/patch-ac     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2008/01/10 21:42:51 adam Exp $
-
---- src/filter.c.orig  2007-05-14 18:26:50.000000000 +0200
-+++ src/filter.c
-@@ -1036,11 +1036,11 @@ static char *unindent_filter(char *inden
-              break;
-         default:
-              /* caught spaces before -- this is testing for \n etc */
--#if defined(HAVE_ISWSPACE)
-+#if defined(HAVE_ISWSPACE) && defined(HAVE_BTOWC)
-              if(!iswspace(btowc(c)))
- #else
-                if(!isspace(c))
--#endif /* HAVE_ISWSPACE */
-+#endif /* HAVE_ISWSPACE && HAVE_BTOWC */
-                   unindented[f++] = c;
-              break;
-         }
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-ad
--- a/databases/gq/patches/patch-ad     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/01/10 21:42:51 adam Exp $
-
---- src/dt_password.c.orig     2007-05-14 18:26:51.000000000 +0200
-+++ src/dt_password.c
-@@ -48,6 +48,15 @@
- #include <openssl/md5.h>
- #include <openssl/md4.h>
- #include <openssl/sha.h>
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
-+# define des_fcrypt           DES_fcrypt
-+# define des_cblock           DES_cblock
-+# define des_set_odd_parity   DES_set_odd_parity
-+# define des_set_key_unchecked(key,schedule)  DES_set_key_unchecked(key, &(schedule))
-+# define des_ecb_encrypt(input, output, ks, enc)      DES_ecb_encrypt(input, output, &(schedule), enc)
-+# define des_key_schedule     DES_key_schedule
-+#endif
- #endif /* defined(HAVE_LIBCRYPTO) */
- 
- #include "common.h"
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-ae
--- a/databases/gq/patches/patch-ae     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/01/08 17:21:19 joerg Exp $
-
---- src/gq-hash-openssl.c.orig 2007-05-14 16:26:50.000000000 +0000
-+++ src/gq-hash-openssl.c
-@@ -60,7 +60,7 @@ gq_hash_crypt(gchar const *data, gsize l
-      salt->str[2] = 0;
- 
-      g_byte_array_append(gb, (guchar*)"{CRYPT}", 7);
--     des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
-+     DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
- 
-      g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf));
- 
-@@ -242,7 +242,7 @@ static const char *lmhash_key = "KGS!@#$
- /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be
-    handled by toupper) */
- 
--static void lm_make_key(const char *pw, des_cblock *key)
-+static void lm_make_key(const char *pw, DES_cblock *key)
- {
-      int i;
-      char *k = (char *) key;
-@@ -253,7 +253,7 @@ static void lm_make_key(const char *pw, 
-         k[i+1]  = (pw[i] << (7 - i)) & 0xff;
-      }
- 
--     des_set_odd_parity(key);
-+     DES_set_odd_parity(key);
- }
- 
- GByteArray*
-@@ -262,10 +262,10 @@ gq_hash_lmhash(gchar const* data, gsize 
-      unsigned int i;
-      char hex[2];
-      char plain[15];
--     des_key_schedule schedule;
-+     DES_key_schedule schedule;
-      GByteArray *gb = NULL;
--     des_cblock ckey1, ckey2;
--     des_cblock bin1,  bin2;
-+     DES_cblock ckey1, ckey2;
-+     DES_cblock bin1,  bin2;
- 
-      memset(plain, 0, sizeof(plain));
- 
-@@ -274,12 +274,12 @@ gq_hash_lmhash(gchar const* data, gsize 
-      }
- 
-      lm_make_key(plain, &ckey1);
--     des_set_key_unchecked(&ckey1, schedule);
--     des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT);
-+     DES_set_key_unchecked(&ckey1, &schedule);
-+     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT);
- 
-      lm_make_key(plain + 7, &ckey2);
--     des_set_key_unchecked(&ckey2, schedule);
--     des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT);
-+     DES_set_key_unchecked(&ckey2, &schedule);
-+     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT);
- 
-      gb = g_byte_array_new();
- 
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-an
--- a/databases/gq/patches/patch-an     Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.2 2008/01/10 21:42:54 adam Exp $
-
---- src/gq.c.orig      2008-01-10 22:31:56.000000000 +0100
-+++ src/gq.c
-@@ -32,6 +32,10 @@
- # include  <config.h>
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef HAVE_LOCALE_H
-+# include  <locale.h>
-+#endif /* HAVE_LOCALE_H */
-+
- #ifdef DEBUG
- #  include "debug.h"
- #  ifdef HAVE_MCHECK
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-src_Makefile.in
--- a/databases/gq/patches/patch-src_Makefile.in        Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2011/03/29 10:44:17 adam Exp $
-
-Crypto libraries are required for linking gq.
-
---- src/Makefile.in.orig       2011-03-29 10:24:01.000000000 +0000
-+++ src/Makefile.in
-@@ -403,7 +403,7 @@ clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- gq$(EXEEXT): $(gq_OBJECTS) $(gq_DEPENDENCIES) 
-       @rm -f gq$(EXEEXT)
--      $(OBJCLINK) $(gq_OBJECTS) $(gq_LDADD) $(LIBS)
-+      $(OBJCLINK) $(gq_OBJECTS) $(gq_LDADD) $(LIBS) $(CRYPTO_LIBS)
- 
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
diff -r 70655d0778e8 -r 7cb5aaf4345b databases/gq/patches/patch-src_gq-hash_h
--- a/databases/gq/patches/patch-src_gq-hash_h  Wed Mar 11 16:13:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_gq-hash_h,v 1.1 2012/05/06 20:12:35 dholland Exp $



Home | Main Index | Thread Index | Old Index