RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Apr-2012 19:20:22
Branch: rpm-5_4 Handle: 2012041817202101
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/lib rpmfc.c
Log:
- rpmfc: fix: OS X (and *BSD) are sighandler_t challenged.
Summary:
Revision Changes Path
1.3501.2.240+1 -0 rpm/CHANGES
2.472.2.61 +3 -0 rpm/configure.ac
1.75.2.10 +5 -0 rpm/lib/rpmfc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.239 -r1.3501.2.240 CHANGES
--- rpm/CHANGES 14 Apr 2012 18:08:33 -0000 1.3501.2.239
+++ rpm/CHANGES 18 Apr 2012 17:20:21 -0000 1.3501.2.240
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+ - jbj: rpmfc: fix: OS X (and *BSD) are sighandler_t challenged.
- jbj: fix: don't hash RPMTAG_FILERDEVS because of %dev usage.
- jbj: change I18NSTRING -> STRING data type.
- mdawkins: start rpm-5.4.9 development.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.60 -r2.472.2.61 configure.ac
--- rpm/configure.ac 16 Apr 2012 03:21:21 -0000 2.472.2.60
+++ rpm/configure.ac 18 Apr 2012 17:20:21 -0000 2.472.2.61
@@ -892,6 +892,9 @@
AC_CHECK_SIZEOF(long long, 8)
AC_CHECK_SIZEOF(unsigned long long, 8)
+dnl linux/posix and *BSD signals differ still, sigh
+AC_CHECK_TYPES([sighanlder_t, sig_t])
+
dnl checks for library functions (specific)
AC_FUNC_ALLOCA
AC_FUNC_VPRINTF
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.75.2.9 -r1.75.2.10 rpmfc.c
--- rpm/lib/rpmfc.c 15 Apr 2012 21:20:57 -0000 1.75.2.9
+++ rpm/lib/rpmfc.c 18 Apr 2012 17:20:22 -0000 1.75.2.10
@@ -60,6 +60,11 @@
return 0;
}
+/* XXX FIXME: more AutoFu testing needed? */
+#if defined(HAVE_SIG_T) && !defined(SIGHANDLER_T)
+typedef sig_t sighandler_t;
+#endif
+
/**
* Return output from helper script.
* @todo Use poll(2) rather than select(2), if available.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
