cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preproc trick to avoid our getmntent when we define a static of the

Browse Source 
same name.

Appeases gcc4
This commit is contained in:
espie 2010-05-19 13:45:15 +00:00
parent f18a95b822
commit 21c19df3ed
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/rpm/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2000/12/06 09:45:02 espie Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2010/05/19 13:45:15 espie Exp $
--- Makefile.in.orig Wed Sep 13 22:00:40 2000
+++ Makefile.in Tue Dec 5 13:22:12 2000
@@ -167,15 +167,15 @@ SUBDIRS = intl po popt lib build misc to
+++ Makefile.in Wed May 19 05:28:31 2010
@@ -167,15 +167,15 @@ SUBDIRS = intl po popt lib build misc tools scripts te
INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@

8
misc/rpm/patches/patch-build_parseChangelog_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-build_parseChangelog_c,v 1.1.1.1 2000/06/12 18:49:41 espie Exp $
--- build/parseChangelog.c.orig Mon Jun 12 02:00:54 2000
+++ build/parseChangelog.c Mon Jun 12 02:01:11 2000
@@ -84,8 +84,10 @@ static int dateToTimet(const char * date
$OpenBSD: patch-build_parseChangelog_c,v 1.2 2010/05/19 13:45:15 espie Exp $
--- build/parseChangelog.c.orig Wed Jun 14 14:34:28 2000
+++ build/parseChangelog.c Wed May 19 05:28:31 2010
@@ -84,8 +84,10 @@ static int dateToTimet(const char * datestr, /*@out@*/
*secs = mktime(&time);
if (*secs == -1) return -1;

11
misc/rpm/patches/patch-lib_fs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_fs_c,v 1.1 2002/04/07 00:31:55 espie Exp $
--- lib/fs.c.orig Sun Apr 7 02:16:12 2002
+++ lib/fs.c Sun Apr 7 02:17:44 2002
@@ -3,6 +3,72 @@
$OpenBSD: patch-lib_fs_c,v 1.2 2010/05/19 13:45:15 espie Exp $
--- lib/fs.c.orig Wed Jun 14 14:34:30 2000
+++ lib/fs.c Wed May 19 13:05:05 2010
@@ -3,6 +3,73 @@
#include <rpmlib.h>
#include <rpmmacro.h>
@ -23,6 +23,7 @@ $OpenBSD: patch-lib_fs_c,v 1.1 2002/04/07 00:31:55 espie Exp $
+ return &item;
+}
+#else
+#define getmntent internal_getmntent
+static our_mntent *getmntent(FILE *filep) {
+ static our_mntent item = { NULL };
+ char buf[1024], * start;
@ -74,7 +75,7 @@ $OpenBSD: patch-lib_fs_c,v 1.1 2002/04/07 00:31:55 espie Exp $
struct fsinfo {
/*@only@*/ const char * mntPoint;
dev_t dev;
@@ -301,3 +367,5 @@ int rpmGetFilesystemUsage(const char **
@@ -301,3 +368,5 @@ int rpmGetFilesystemUsage(const char ** fileList, int_
return 0;
}

18
misc/rpm/patches/patch-lib_signature_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- lib/signature.c.orig Mon Dec 30 00:27:20 2002
+++ lib/signature.c Mon Dec 30 00:28:17 2002
@@ -253,11 +253,11 @@ static int makePGPSignature(const char *
$OpenBSD: patch-lib_signature_c,v 1.2 2010/05/19 13:45:15 espie Exp $
--- lib/signature.c.orig Wed Jun 14 14:34:31 2000
+++ lib/signature.c Wed May 19 05:28:31 2010
@@ -253,11 +253,11 @@ static int makePGPSignature(const char *file, /*@out@*
switch(pgpVer) {
case PGP_2:
execlp(path, "pgp", "+batchmode=on", "+verbose=0", "+armor=off",
@ -15,7 +15,7 @@ $OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
break;
case PGP_UNKNOWN:
case PGP_NOTDETECTED:
@@ -340,7 +340,7 @@ static int makeGPGSignature(const char *
@@ -340,7 +340,7 @@ static int makeGPGSignature(const char *file, /*@out@*
execlp("gpg", "gpg",
"--batch", "--no-verbose", "--no-armor", "--passphrase-fd", "3",
"-u", name, "-sbo", sigfile, file,
@ -24,7 +24,7 @@ $OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
rpmError(RPMERR_EXEC, _("Couldn't exec gpg"));
_exit(RPMERR_EXEC);
}
@@ -536,14 +536,14 @@ static int verifyPGPSignature(const char
@@ -536,14 +536,14 @@ static int verifyPGPSignature(const char *datafile, vo
"+OutputInformationFD=1",
/* Write "WARNING: ... is not trusted to... to stdout: */
"+OutputWarningFD=1",
@ -41,7 +41,7 @@ $OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
break;
case PGP_UNKNOWN:
case PGP_NOTDETECTED:
@@ -622,7 +622,7 @@ static int verifyGPGSignature(const char
@@ -622,7 +622,7 @@ static int verifyGPGSignature(const char *datafile, vo
execlp("gpg", "gpg",
"--batch", "--no-verbose",
"--verify", sigfile, datafile,
@ -50,7 +50,7 @@ $OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
fprintf(stderr, _("exec failed!\n"));
rpmError(RPMERR_EXEC,
_("Could not run gpg. Use --nogpg to skip GPG checks."));
@@ -683,7 +683,7 @@ static int checkPassPhrase(const char *p
@@ -683,7 +683,7 @@ static int checkPassPhrase(const char *passPhrase, con
execlp("gpg", "gpg",
"--batch", "--no-verbose", "--passphrase-fd", "3",
"-u", name, "-so", "-",
@ -59,7 +59,7 @@ $OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
rpmError(RPMERR_EXEC, _("Couldn't exec gpg"));
_exit(RPMERR_EXEC);
} /*@notreached@*/ break;
@@ -702,11 +702,11 @@ static int checkPassPhrase(const char *p
@@ -702,11 +702,11 @@ static int checkPassPhrase(const char *passPhrase, con
switch(pgpVer) {
case PGP_2:
execlp(path, "pgp", "+batchmode=on", "+verbose=0",