mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix conflicting glob_t definitions, which triggered a crash

Browse Source 
when importing the rpm4 module in Python.

PR:		ports/162483
Submitted by:	Sean Mitchell <smitchell@hcn-inc.com>
Feature safe:	yes
This commit is contained in:
Johan van Selst 2011-11-14 21:47:47 +00:00
parent 34df09046f
commit c8144eafb4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=285796
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archivers/rpm4/Makefile
View File

@ -6,6 +6,7 @@
PORTNAME= rpm
PORTVERSION= 4.9.1.2
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/ \
ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/

18
archivers/rpm4/files/patch-misc_glob.h Normal file
View File

@ -0,0 +1,18 @@
--- misc/glob.h.orig 2011-11-14 22:06:03.000000000 +0100
+++ misc/glob.h 2011-11-14 22:07:01.000000000 +0100
@@ -110,10 +110,11 @@
#endif
typedef struct
{
- __size_t gl_pathc; /* Count of paths matched by the pattern. */
- char **gl_pathv; /* List of matched pathnames. */
- __size_t gl_offs; /* Slots to reserve in `gl_pathv'. */
- int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */
+ __size_t gl_pathc; /* Count of total paths so far. */
+ __size_t gl_matchc; /* Count of paths matching pattern. */
+ __size_t gl_offs; /* Reserved at beginning of gl_pathv. */
+ int gl_flags; /* Copy of flags parameter to glob. */
+ char **gl_pathv; /* List of paths matching pattern. */
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */