man-db 2.7.4
authorYaakov Selkowitz <yselkowi@redhat.com>
Fri, 9 Oct 2015 18:26:27 +0000 (13:26 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Fri, 9 Oct 2015 18:26:27 +0000 (13:26 -0500)
2.6.7-shared-libmandb.patch [deleted file]
2.7.4-shared-libmandb.patch [new file with mode: 0644]
man-db.cygport

diff --git a/2.6.7-shared-libmandb.patch b/2.6.7-shared-libmandb.patch
deleted file mode 100644 (file)
index e2a2a73..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-These global symbols are used within libmandb, so if we want to make it
-shared, they need to be moved from each of the executables into the library
-
---- origsrc/man-db-2.6.7/libdb/db_ver.c        2013-12-08 18:38:13.000000000 -0600
-+++ src/man-db-2.6.7/libdb/db_ver.c    2014-05-30 12:03:48.648695400 -0500
-@@ -37,6 +37,10 @@
- #include "mydbm.h"
-+/* globals */
-+char *database = NULL;
-+MYDBM_FILE dbf;
-+
- int dbver_rd (MYDBM_FILE dbfile)
- {
-       datum key, content;
---- origsrc/man-db-2.6.7/src/accessdb.c        2014-01-13 05:18:41.000000000 -0600
-+++ src/man-db-2.6.7/src/accessdb.c    2014-05-30 12:12:09.086318800 -0500
-@@ -49,10 +49,6 @@
- char *program_name;
- const char *cat_root;
--/* for db_storage.c */
--char *database;
--MYDBM_FILE dbf;
--
- const char *argp_program_version = "accessdb " PACKAGE_VERSION;
- const char *argp_program_bug_address = PACKAGE_BUGREPORT;
- error_t argp_err_exit_status = FAIL;
---- origsrc/man-db-2.6.7/src/catman.c  2014-01-14 20:22:15.000000000 -0600
-+++ src/man-db-2.6.7/src/catman.c      2014-05-30 12:12:18.804874700 -0500
-@@ -82,10 +82,8 @@
- /* globals */
- char *program_name;
- int quiet = 1;
--MYDBM_FILE dbf;
- char *manp;
- extern char *user_config_file;
--char *database;
- static const char **sections;
- const char *argp_program_version = "catman " PACKAGE_VERSION;
---- origsrc/man-db-2.6.7/src/man.c     2014-03-26 06:19:14.000000000 -0500
-+++ src/man-db-2.6.7/src/man.c 2014-05-30 18:01:03.559596500 -0500
-@@ -188,8 +188,6 @@ static char *manpathlist[MAXDIRS];
- /* globals */
- int quiet = 1;
- char *program_name;
--char *database = NULL;
--MYDBM_FILE dbf; 
- extern const char *extension; /* for globbing.c */
- extern char *user_config_file;        /* defined in manp.c */
- extern int disable_cache;
---- origsrc/man-db-2.6.7/src/mandb.c   2014-04-09 19:30:39.000000000 -0500
-+++ src/man-db-2.6.7/src/mandb.c       2014-05-30 12:11:38.595574900 -0500
-@@ -71,9 +71,7 @@
- char *program_name;
- int quiet = 1;
- extern int opt_test;          /* don't update db */
--MYDBM_FILE dbf;
- char *manp;
--char *database = NULL;
- extern char *extension;               /* for globbing.c */
- extern int force_rescan;      /* for check_mandirs.c */
- static char *single_filename = NULL;
---- origsrc/man-db-2.6.7/src/whatis.c  2014-01-13 05:18:41.000000000 -0600
-+++ src/man-db-2.6.7/src/whatis.c      2014-05-30 12:12:26.972341900 -0500
-@@ -85,8 +85,6 @@ static int num_keywords;
- char *program_name;
- int am_apropos;
--char *database;
--MYDBM_FILE dbf;
- int quiet = 1;
- #ifdef HAVE_ICONV
diff --git a/2.7.4-shared-libmandb.patch b/2.7.4-shared-libmandb.patch
new file mode 100644 (file)
index 0000000..67232c3
--- /dev/null
@@ -0,0 +1,63 @@
+--- origsrc/man-db-2.7.4/libdb/db_ver.c        2015-04-08 04:23:25.000000000 -0500
++++ src/man-db-2.7.4/libdb/db_ver.c    2015-10-08 21:17:15.986955600 -0500
+@@ -37,6 +37,8 @@
+ #include "mydbm.h"
++char *database = NULL;
++
+ int dbver_rd (MYDBM_FILE dbfile)
+ {
+       datum key, content;
+--- origsrc/man-db-2.7.4/src/accessdb.c        2015-04-08 04:23:25.000000000 -0500
++++ src/man-db-2.7.4/src/accessdb.c    2015-10-08 21:18:29.661811100 -0500
+@@ -49,9 +49,6 @@
+ char *program_name;
+ const char *cat_root;
+-/* for db_storage.c */
+-char *database;
+-
+ const char *argp_program_version = "accessdb " PACKAGE_VERSION;
+ const char *argp_program_bug_address = PACKAGE_BUGREPORT;
+ error_t argp_err_exit_status = FAIL;
+--- origsrc/man-db-2.7.4/src/catman.c  2015-04-08 04:23:25.000000000 -0500
++++ src/man-db-2.7.4/src/catman.c      2015-10-08 21:18:33.018237300 -0500
+@@ -85,7 +85,6 @@ int quiet = 1;
+ MYDBM_FILE dbf_close_post_fork;
+ char *manp;
+ extern char *user_config_file;
+-char *database;
+ static const char **sections;
+ const char *argp_program_version = "catman " PACKAGE_VERSION;
+--- origsrc/man-db-2.7.4/src/man.c     2015-10-07 19:44:31.000000000 -0500
++++ src/man-db-2.7.4/src/man.c 2015-10-08 21:18:45.220786900 -0500
+@@ -189,7 +189,6 @@ static char *manpathlist[MAXDIRS];
+ /* globals */
+ int quiet = 1;
+ char *program_name;
+-char *database = NULL;
+ extern const char *extension; /* for globbing.c */
+ extern char *user_config_file;        /* defined in manp.c */
+ extern int disable_cache;
+--- origsrc/man-db-2.7.4/src/mandb.c   2015-09-22 08:15:30.000000000 -0500
++++ src/man-db-2.7.4/src/mandb.c       2015-10-08 21:18:52.547217200 -0500
+@@ -76,7 +76,6 @@ char *program_name;
+ int quiet = 1;
+ extern int opt_test;          /* don't update db */
+ char *manp;
+-char *database = NULL;
+ extern char *extension;               /* for globbing.c */
+ extern int force_rescan;      /* for check_mandirs.c */
+ static char *single_filename = NULL;
+--- origsrc/man-db-2.7.4/src/whatis.c  2015-04-08 04:23:25.000000000 -0500
++++ src/man-db-2.7.4/src/whatis.c      2015-10-08 21:18:59.648619000 -0500
+@@ -85,7 +85,6 @@ static int num_keywords;
+ char *program_name;
+ int am_apropos;
+-char *database;
+ int quiet = 1;
+ #ifdef HAVE_ICONV
index 55a9269e3a0fdf9c497eb54b825410a7a1f7d36b..3fd5b3034cecdd38e79a3a41aa7e3162a049a349 100644 (file)
@@ -1,5 +1,5 @@
 NAME="man-db"
-VERSION=2.7.1
+VERSION=2.7.4
 RELEASE=1
 CATEGORY="Base"
 SUMMARY="Man page viewer"
@@ -9,7 +9,7 @@ of the traditional flat-text whatis databases."
 HOMEPAGE="http://www.nongnu.org/man-db/"
 SRC_URI="mirror://savannah/man-db/man-db-${VERSION}.tar.xz"
 PATCH_URI="
-       2.6.7-shared-libmandb.patch
+       2.7.4-shared-libmandb.patch
 "
 
 PKG_NAMES=${NAME}
This page took 0.026832 seconds and 5 git commands to generate.