dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump & cleanup

Browse Source 
Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2014-06-23 09:50:30 +02:00
parent a4b8a0b3cf
commit 997d3e1131
13 changed files with 16 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app-admin/reprepro/files/reprepro-3.5.2-db-4_5-1.patch
View File

@@ -1,76 +0,0 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2008-07-25
Initial Package Version: 2.2.2
Origin: me
Upstream Status: Unknown
Description: Add Support for berkerly db 4.5
diff -Naur reprepro-3.5.2.orig/configure.ac reprepro-3.5.2/configure.ac
--- reprepro-3.5.2.orig/configure.ac 2008-06-27 15:31:23.000000000 +0000
+++ reprepro-3.5.2/configure.ac 2008-07-25 20:41:48.000000000 +0000
@@ -26,7 +26,7 @@
DBCPPFLAGS=""
AH_TEMPLATE([LIBDB_VERSION],[variant of libdb used])
AC_ARG_WITH(libdb,
-[ --with-libdb=path|4.4|4.3|3 Give prefix of libdb-4.3 or older version to use],[dnl
+[ --with-libdb=path|4.6|4.5|4.4|4.3|3 Give prefix of libdb-4.3 or older version to use],[dnl
case "$withval" in
no)
AC_MSG_ERROR(["Cannot compile without libdb"]);
@@ -40,6 +40,9 @@
4.4)
DB_WANT_VERSION=4.4
;;
+ 4.5)
+ DB_WANT_VERSION=4.5
+ ;;
4.6)
DB_WANT_VERSION=4.6
;;
@@ -83,6 +86,12 @@
elif test "$DB_WANT_VERSION" != "4.4" ; then
AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION])
fi
+elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x5" ; then
+ if test "$DB_WANT_VERSION" = "any" ; then
+ DB_WANT_VERSION=4.5
+ elif test "$DB_WANT_VERSION" != "4.5" ; then
+ AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION])
+ fi
elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x6" ; then
if test "$DB_WANT_VERSION" = "any" ; then
DB_WANT_VERSION=4.6
@@ -91,7 +100,7 @@
fi
else
AC_MSG_ERROR([Unsupported libdb major $DB_VERSION_MAJOR minor $DB_VERSION_MINOR
-Only 4.3 (stronly recommended) or 3.2 or 4.4 or 4.6 are supported])
+Only 4.3 (stronly recommended) or 3.2 or 4.4 or 4.5 or 4.6 are supported])
fi
# now we have a header with the expected version, check for the library:
@@ -102,6 +111,12 @@
DBLIBS="-ldb-4.6 $DBLIBS"
],[AC_MSG_ERROR(["no libdb-4.6 found"])],[$DBLIBS])
;;
+4.5)
+ AC_CHECK_LIB(db-4.5,db_create,[dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),45)
+ DBLIBS="-ldb-4.5 $DBLIBS"
+ ],[AC_MSG_ERROR(["no libdb-4.5 found"])],[$DBLIBS])
+;;
4.4)
AC_CHECK_LIB(db-4.4,db_create,[dnl
AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),44)
diff -Naur reprepro-3.5.2.orig/database.c reprepro-3.5.2/database.c
--- reprepro-3.5.2.orig/database.c 2008-06-06 21:00:21.000000000 +0000
+++ reprepro-3.5.2/database.c 2008-07-25 20:42:32.000000000 +0000
@@ -245,6 +245,8 @@
#if LIBDB_VERSION == 46
#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
+#elif LIBDB_VERSION == 45
+#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
#elif LIBDB_VERSION == 44
#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
#elif LIBDB_VERSION == 43

46
app-admin/reprepro/files/reprepro-3.5.2-gpgme-header-check-1.patch
View File

@@ -1,46 +0,0 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2008-07-25
Initial Package Version: 2.2.2
Origin: hron@hronszoft.dyndns.biz
Upstream Status: never accepted
Description: find gpgme headers
diff -Naur reprepro-3.5.2.orig/configure.ac reprepro-3.5.2/configure.ac
--- reprepro-3.5.2.orig/configure.ac 2008-06-27 15:31:23.000000000 +0000
+++ reprepro-3.5.2/configure.ac 2008-07-25 20:57:28.000000000 +0000
@@ -134,20 +134,20 @@
no)
;;
yes)
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],)
;;
*)
CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],)
;;
esac
],[dnl default is to behave like yes (for libgpgme only)
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found (to disable run with --without-libgpgme)"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found (to disable run with --without-libgpgme)"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found (to disable run with --without-libgpgme)"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["did not find libgpgme versoion 0.4.1 or later (to disable run with --without-libgpgme)"])],)
])
diff -Naur reprepro-3.5.2.orig/signature.c reprepro-3.5.2/signature.c
--- reprepro-3.5.2.orig/signature.c 2008-03-06 16:14:55.000000000 +0000
+++ reprepro-3.5.2/signature.c 2008-07-25 20:57:43.000000000 +0000
@@ -26,7 +26,7 @@
#include <malloc.h>
#include <fcntl.h>
#ifdef HAVE_LIBGPGME
-#include <gpgme.h>
+#include <gpgme/gpgme.h>
#endif
#include "globals.h"
#include "error.h"

76
app-admin/reprepro/files/reprepro-3.8.1-db-4_5-1.patch
View File

@@ -1,76 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-01-28
Initial Package Version: 3.5.2
Origin: me
Upstream Status: unknown
Description: add support for db 4.5
diff -Naur reprepro-3.8.1.orig/configure.ac reprepro-3.8.1/configure.ac
--- reprepro-3.8.1.orig/configure.ac 2009-01-28 11:05:36.195261912 +0000
+++ reprepro-3.8.1/configure.ac 2009-01-28 11:08:19.502260024 +0000
@@ -26,7 +26,7 @@
DBCPPFLAGS=""
AH_TEMPLATE([LIBDB_VERSION],[variant of libdb used])
AC_ARG_WITH(libdb,
-[ --with-libdb=path|4.7|4.6|4.4|4.3|3 Give prefix of libdb or specify version to use],[dnl
+[ --with-libdb=path|4.7|4.6|4.5|4.4|4.3|3 Give prefix of libdb or specify version to use],[dnl
case "$withval" in
no)
AC_MSG_ERROR(["Cannot compile without libdb"]);
@@ -40,6 +40,9 @@
4.4)
DB_WANT_VERSION=4.4
;;
+ 4.5)
+ DB_WANT_VERSION=4.5
+ ;;
4.6)
DB_WANT_VERSION=4.6
;;
@@ -86,6 +89,12 @@
elif test "$DB_WANT_VERSION" != "4.4" ; then
AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION])
fi
+elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x5" ; then
+ if test "$DB_WANT_VERSION" = "any" ; then
+ DB_WANT_VERSION=4.5
+ elif test "$DB_WANT_VERSION" != "4.5" ; then
+ AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION])
+ fi
elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x6" ; then
if test "$DB_WANT_VERSION" = "any" ; then
DB_WANT_VERSION=4.6
@@ -103,7 +112,7 @@
fi
else
AC_MSG_ERROR([Unsupported libdb major $DB_VERSION_MAJOR minor $DB_VERSION_MINOR
-Only 4.6 (recommended) or 3.2 or 4.4 or 4.3 or 4.7 are supported])
+Only 4.6 (recommended) or 3.2 or 4.3 or 4.4 or 4.5 or 4.7 are supported])
fi
# now we have a header with the expected version, check for the library:
@@ -120,6 +129,12 @@
DBLIBS="-ldb-4.6 $DBLIBS"
],[AC_MSG_ERROR(["no libdb-4.6 found"])],[$DBLIBS])
;;
+4.5)
+ AC_CHECK_LIB(db-4.5,db_create,[dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),45)
+ DBLIBS="-ldb-4.5 $DBLIBS"
+ ],[AC_MSG_ERROR(["no libdb-4.5 found"])],[$DBLIBS])
+;;
4.4)
AC_CHECK_LIB(db-4.4,db_create,[dnl
AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),44)
diff -Naur reprepro-3.8.1.orig/database.c reprepro-3.8.1/database.c
--- reprepro-3.8.1.orig/database.c 2009-01-28 11:05:36.201260707 +0000
+++ reprepro-3.8.1/database.c 2009-01-28 11:09:32.589262903 +0000
@@ -246,6 +246,8 @@
#elif LIBDB_VERSION == 47
#warning libdb4.7 not yet tested. Use on your own risk
#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
+#elif LIBDB_VERSION == 45
+#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
#elif LIBDB_VERSION == 44
#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664)
#elif LIBDB_VERSION == 43

46
app-admin/reprepro/files/reprepro-3.8.1-gpgme-header-check-1.patch
View File

@@ -1,46 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-01-28
Initial Package Version: 3.5.2
Origin: hron@hronszoft.dyndns.biz
Upstream Status: gentoo specific
Description: find gpgme.h
diff -Naur reprepro-3.8.1.orig/configure.ac reprepro-3.8.1/configure.ac
--- reprepro-3.8.1.orig/configure.ac 2009-01-28 10:55:34.423017172 +0000
+++ reprepro-3.8.1/configure.ac 2009-01-28 10:57:08.469016466 +0000
@@ -152,20 +152,20 @@
no)
;;
yes)
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],)
;;
*)
CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],)
;;
esac
],[dnl default is to behave like yes (for libgpgme only)
- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found (to disable run with --without-libgpgme)"])])
+ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found (to disable run with --without-libgpgme)"])])
AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found (to disable run with --without-libgpgme)"])],)
AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["did not find libgpgme versoion 0.4.1 or later (to disable run with --without-libgpgme)"])],)
])
diff -Naur reprepro-3.8.1.orig/signature.c reprepro-3.8.1/signature.c
--- reprepro-3.8.1.orig/signature.c 2009-01-28 10:55:34.412015470 +0000
+++ reprepro-3.8.1/signature.c 2009-01-28 10:58:59.871258599 +0000
@@ -27,7 +27,7 @@
#include <fcntl.h>
#ifdef HAVE_LIBGPGME
#include <gpg-error.h>
-#include <gpgme.h>
+#include <gpgme/gpgme.h>
#endif
#include "globals.h"
#include "error.h"