[40250] trunk/dports/sysutils/rpm

[afb at macports.org]

Revision: 40250
          http://trac.macports.org/changeset/40250
Author:   afb at macports.org
Date:     2008-09-27 01:14:28 -0700 (Sat, 27 Sep 2008)
Log Message:
-----------
support for neon 0.28 (#16659)

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-neon.diff

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2008-09-27 07:52:37 UTC (rev 40249)
+++ trunk/dports/sysutils/rpm/Portfile	2008-09-27 08:14:28 UTC (rev 40250)
@@ -4,7 +4,7 @@
 
 name			rpm
 version			4.4.9
-revision                5
+revision                6
 platforms		darwin freebsd linux
 categories		sysutils archivers
 maintainers		n3npq at mac.com
@@ -43,7 +43,8 @@
 			# needed because it checks for sqlite3_open in sqlite lib...
 configure.env		ac_cv_lib_sqlite_sqlite3_open=yes
 
-patchfiles		patch-macros.in \
+patchfiles		patch-neon.diff \
+			patch-macros.in \
 			patch-configure \
 			patch-Makefile.PL \
 			patch-darwin.prov \

Added: trunk/dports/sysutils/rpm/files/patch-neon.diff
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-neon.diff	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-neon.diff	2008-09-27 08:14:28 UTC (rev 40250)
@@ -0,0 +1,63 @@
+# http://bugs.gentoo.org/show_bug.cgi?id=214799 :
+# http://bugs.gentoo.org/attachment.cgi?id=152271
+diff -Naur tmp-old/rpmio/rpmdav.c tmp-new/rpmio/rpmdav.c
+--- rpmio/rpmdav.c	2008-03-28 04:40:52.000000000 +0000
++++ rpmio/rpmdav.c	2008-03-28 05:19:50.000000000 +0000
+@@ -103,7 +103,7 @@
+ }
+ 
+ static void davNotify(void * userdata,
+-		ne_conn_status connstatus, const char * info)
++		ne_session_status sessionstatus, const char * info)
+ 	/*@*/
+ {
+     urlinfo u = userdata;
+@@ -124,18 +124,20 @@
+ 
+ #ifdef	REFERENCE
+ typedef enum {
+-    ne_conn_namelookup, /* lookup up hostname (info = hostname) */
+-    ne_conn_connecting, /* connecting to host (info = hostname) */
+-    ne_conn_connected, /* connected to host (info = hostname) */
+-    ne_conn_secure /* connection now secure (info = crypto level) */
+-} ne_conn_status;
++    ne_status_lookup = 0, /* looking up hostname */
++    ne_status_connecting, /* connecting to host */
++    ne_status_connected, /* connected to host */
++    ne_status_sending, /* sending a request body */
++    ne_status_recving, /* receiving a response body */
++    ne_status_disconnected /* disconnected from host */
++} ne_session_status;
+ #endif
+ 
+-    u->connstatus = connstatus;
++    u->sessionstatus = sessionstatus;
+ 
+ /*@-boundsread@*/
+ if (_dav_debug < 0)
+-fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, connstatus, info, sess, u, connstates[ (connstatus < 4 ? connstatus : 4)]);
++fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, sessionstatus, info, sess, u, connstates[ (sessionstatus < 5 ? sessionstatus : 5)]);
+ /*@=boundsread@*/
+ 
+ }
+@@ -350,7 +352,7 @@
+ #endif
+ 
+ 	ne_set_progress(u->sess, davProgress, u);
+-	ne_set_status(u->sess, davNotify, u);
++	ne_set_notifier(u->sess, davNotify, u);
+ 
+ 	ne_set_persist(u->sess, 1);
+ 	ne_set_read_timeout(u->sess, httpTimeoutSecs);
+diff -Naur tmp-old/rpmio/rpmurl.h tmp-new/rpmio/rpmurl.h
+--- rpmio/rpmurl.h	2008-03-28 04:55:02.000000000 +0000
++++ rpmio/rpmurl.h	2008-03-28 04:56:09.000000000 +0000
+@@ -60,7 +60,7 @@
+     void * sess;		/*!< neon: ne_session ptr */
+     off_t current;		/*!< neon: current body offset. */
+     off_t total;		/*!< neon: total body length. */
+-    int connstatus;		/*!< neon: connection status. */
++    int sessionstatus;		/*!< neon: session status. */
+ #ifdef  REFERENCE
+ typedef enum {
+     ne_conn_namelookup,	/* lookup up hostname (info = hostname) */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080927/fb3ac38c/attachment.html