From 20213100915dca67fb4cb147de2dd7fa7a60bdef Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 20 Jan 2006 08:40:11 +0000 Subject: [PATCH 01/63] auto-import libupnp-1.2.1a-4 on branch devel from libupnp-1.2.1a-4.src.rpm --- .cvsignore | 1 + libupnp.spec | 103 +++++++++++++ libupnp_dsm_320.patch | 301 ++++++++++++++++++++++++++++++++++++++ libupnp_ixml_FC4.patch | 18 +++ libupnp_performance.patch | 20 +++ sources | 1 + 6 files changed, 444 insertions(+) create mode 100644 libupnp.spec create mode 100644 libupnp_dsm_320.patch create mode 100644 libupnp_ixml_FC4.patch create mode 100644 libupnp_performance.patch diff --git a/.cvsignore b/.cvsignore index e69de29..0c025ad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libupnp-1.2.1a.tar.gz diff --git a/libupnp.spec b/libupnp.spec new file mode 100644 index 0000000..722ea1d --- /dev/null +++ b/libupnp.spec @@ -0,0 +1,103 @@ +Version: 1.2.1a +Summary: Universal Plug and Play (UPnP) SDK +Name: libupnp +Release: 4%{?dist} +License: BSD +Group: System Environment/Libraries +URL: http://upnp.sourceforge.net/ +Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz +Patch0: libupnp_dsm_320.patch +Patch1: libupnp_ixml_FC4.patch +Patch2: libupnp_performance.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +The Universal Plug and Play (UPnP) SDK for Linux provides +support for building UPnP-compliant control points, devices, +and bridges on Linux. + +%package devel +Group: Development/Libraries +Summary: Include files needed for development with libupnp +Requires: libupnp = %{version}-%{release} + +%description devel +The libupnp-devel package contains the files necessary for development with +the UPnP SDK libraries. + +%prep +%setup -q + +%patch0 -p0 +%patch1 -p0 +%patch2 -p1 +chmod 644 {LICENSE,README} + +# Fix permissions for files in debuginfo package +find . -name '*.[ch]' | xargs chmod 644 + +# Fix libupnp.so symlink +sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile + +# Remove -Os optflag and add RPM optflags in makefiles +# Install libraries in correct directories +find . -name '[Mm]akefile' | xargs sed -i \ + -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ + -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ + -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ + -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ + -e 's#/usr/lib$#%{_libdir}#g' + +%build +make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +## Install libupnp.so and headers +make -C upnp PREFIX=%{buildroot} install + +## Install libixml.so and headers +make -C ixml PREFIX=%{buildroot} install +install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp + +## Install libthreadutil.so and headers +make -C threadutil PREFIX=%{buildroot} install + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc LICENSE README +%{_libdir}/libixml.so* +%{_libdir}/libthreadutil.so* +%{_libdir}/libupnp.so* + +%files devel +%defattr(0644,root,root,0755) +%{_includedir}/upnp/ + +%clean +rm -rf %{buildroot} + +%changelog +* Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 +- Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 + +* Sun Jan 8 2006 Paul Howarth 1.2.1a-3 +- Disable stripping of object code for sane debuginfo generation +- Edit makefiles to hnnor RPM optflags +- Install libraries in %%{_libdir} rather than hardcoded /usr/lib +- Fix libupnp.so symlink +- Own directory %%{_includedir}/upnp +- Fix permissions in -devel package + +* Fri Jan 06 2006 Eric Tanguy 1.2.1a-2 +- Use 'install -p' to preserve timestamps +- Devel now require full version-release of main package + +* Thu Dec 22 2005 Eric Tanguy 1.2.1a-1 +- Modify spec file from +http://rpm.pbone.net/index.php3/stat/4/idpl/2378737/com/libupnp-1.2.1a_DSM320-3.i386.rpm.html diff --git a/libupnp_dsm_320.patch b/libupnp_dsm_320.patch new file mode 100644 index 0000000..a54a99f --- /dev/null +++ b/libupnp_dsm_320.patch @@ -0,0 +1,301 @@ +diff -Naur ../libupnp-1.2.1a/upnp/inc/config.h upnp/inc/config.h +--- ../libupnp-1.2.1a/upnp/inc/config.h 2003-02-13 17:19:02.000000000 +0100 ++++ upnp/inc/config.h 2005-11-05 20:42:25.000000000 +0100 +@@ -56,6 +56,17 @@ + #define THREAD_IDLE_TIME 5000 + //@} + ++/** @name X_USER_AGENT ++ * The {\tt X_USER_AGENT} constant specifies the value of the X-User-Agent: ++ * HTTP header. The value "redsonic" is needed for the DSM-320. See ++ * https://sourceforge.net/forum/message.php?msg_id=3166856 for more ++ * information ++ */ ++ ++//@{ ++#define X_USER_AGENT "redsonic" ++//@} ++ + /** @name JOBS_PER_THREAD + * The {\tt JOBS_PER_THREAD} constant determines when a new thread will be + * allocated to the thread pool inside the SDK. The thread pool will +diff -Naur ../libupnp-1.2.1a/upnp/src/gena/gena_device.c upnp/src/gena/gena_device.c +--- ../libupnp-1.2.1a/upnp/src/gena/gena_device.c 2003-02-13 17:19:11.000000000 +0100 ++++ upnp/src/gena/gena_device.c 2005-11-05 20:18:42.000000000 +0100 +@@ -1164,10 +1164,16 @@ + + membuffer_init( &response ); + response.size_inc = 30; ++/* - PATCH START - Sergey 'Jin' Bostandzhyan ++ * added X-User-Agent header ++ */ + if( http_MakeMessage( &response, major, minor, +- "R" "D" "S" "ssc" "sc" "c", ++ "R" "D" "S" "Xc" "ssc" "sc" "c", + HTTP_OK, +- "SID: ", sub->sid, timeout_str ) != 0 ) { ++ X_USER_AGENT, ++ "SID: ", sub->sid, timeout_str ) != 0 ) ++/* - PATCH END --- */ ++ { + membuffer_destroy( &response ); + error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request ); + return UPNP_E_OUTOF_MEMORY; +diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c upnp/src/genlib/net/http/httpreadwrite.c +--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c 2003-02-13 17:19:13.000000000 +0100 ++++ upnp/src/genlib/net/http/httpreadwrite.c 2005-11-05 20:04:51.000000000 +0100 +@@ -1632,6 +1632,9 @@ + * appends content-length, content-type and HTML body for given code + * 'T': arg = char * content_type; format e.g: "text/html"; + * content-type header ++* --- PATCH START - Sergey 'Jin' Bostandzhyan ++* 'X': arg = const char useragent; "redsonic" HTTP X-User-Agent: useragent ++* --- PATCH END --- + * + * Return : int; + * 0 - On Success +@@ -1800,6 +1803,24 @@ + } + } + ++/* --- PATCH START - Sergey 'Jin' Bostandzhyan */ ++ if( c == 'X' ) // C string ++ { ++ s = ( char * )va_arg( argp, char * ); ++ ++ assert( s ); ++ ++ if( membuffer_append_str( buf, "X-User-Agent: ") != 0 ) { ++ goto error_handler; ++ } ++ if( membuffer_append( buf, s, strlen( s ) ) != 0 ) { ++ goto error_handler; ++ } ++ } ++ ++/* --- PATCH END --- */ ++ ++ + else if( c == 'R' ) { + // response start line + // e.g.: 'HTTP/1.1 200 OK' +diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c upnp/src/genlib/net/http/webserver.c +--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c 2003-02-13 17:19:14.000000000 +0100 ++++ upnp/src/genlib/net/http/webserver.c 2005-11-05 20:53:56.000000000 +0100 +@@ -1368,16 +1368,22 @@ + } + + if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) { ++ ++/* - PATCH START - Sergey 'Jin' Bostandzhyan ++ * added X-User-Agent header ++ */ ++ + //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT + //Transfer-Encoding: chunked + // K means add chunky header ang G means range header. +- if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSCc", HTTP_PARTIAL_CONTENT, // status code ++ if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code + // RespInstr->ReadSendSize,// content length + finfo.content_type, + // content_type.buf, // content type + RespInstr, // Range + "LAST-MODIFIED: ", +- &finfo.last_modified ) != 0 ) { ++ &finfo.last_modified, ++ X_USER_AGENT) != 0 ) { + goto error_handler; + } + } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) { +@@ -1385,13 +1391,14 @@ + //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT + //Transfer-Encoding: chunked + // K means add chunky header ang G means range header. +- if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSCc", HTTP_PARTIAL_CONTENT, // status code ++ if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code + RespInstr->ReadSendSize, // content length + finfo.content_type, + //content_type.buf, // content type + RespInstr, //Range Info + "LAST-MODIFIED: ", +- &finfo.last_modified ) != 0 ) { ++ &finfo.last_modified, ++ X_USER_AGENT) != 0 ) { + goto error_handler; + } + +@@ -1400,12 +1407,13 @@ + //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT + //Transfer-Encoding: chunked + // K means add chunky header ang G means range header. +- if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSCc", HTTP_OK, // status code ++ if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSXcCc", HTTP_OK, // status code + //RespInstr->ReadSendSize,// content length + finfo.content_type, + // content_type.buf, // content type + "LAST-MODIFIED: ", +- &finfo.last_modified ) != 0 ) { ++ &finfo.last_modified, ++ X_USER_AGENT) != 0 ) { + goto error_handler; + } + +@@ -1414,28 +1422,31 @@ + //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT + //Transfer-Encoding: chunked + // K means add chunky header ang G means range header. +- if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSCc", HTTP_OK, // status code ++ if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSXcCc", HTTP_OK, // status code + RespInstr->ReadSendSize, // content length + finfo.content_type, + //content_type.buf, // content type + "LAST-MODIFIED: ", +- &finfo.last_modified ) != 0 ) { ++ &finfo.last_modified, ++ X_USER_AGENT) != 0 ) { + goto error_handler; + } + } else { + //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT + //Transfer-Encoding: chunked + // K means add chunky header ang G means range header. +- if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSCc", HTTP_OK, // status code ++ if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSXcCc", HTTP_OK, // status code + //RespInstr->ReadSendSize,// content length + finfo.content_type, + //content_type.buf, // content type + "LAST-MODIFIED: ", +- &finfo.last_modified ) != 0 ) { ++ &finfo.last_modified, ++ X_USER_AGENT) != 0 ) { + goto error_handler; + } + } + } ++/* -- PATCH END -- */ + + if( req->method == HTTPMETHOD_HEAD ) { + *rtype = RESP_HEADERS; +@@ -1717,8 +1728,14 @@ + http_RecvPostMessage( parser, info, filename.buf, + &RespInstr ); + //Send response. +- http_MakeMessage( &headers, 1, 1, "RTDSCc", ret, +- "text/html" ); ++ ++/* - PATCH START - Sergey 'Jin' Bostandzhyan ++ * added X-User-Agent header ++ */ ++ http_MakeMessage( &headers, 1, 1, "RTDSXcCc", ret, ++ "text/html", X_USER_AGENT ); ++/* - PATCH END --- */ ++ + http_SendMessage( info, &timeout, "b", headers.buf, + headers.length ); + break; +diff -Naur ../libupnp-1.2.1a/upnp/src/soap/soap_device.c upnp/src/soap/soap_device.c +--- ../libupnp-1.2.1a/upnp/src/soap/soap_device.c 2003-02-13 17:19:20.000000000 +0100 ++++ upnp/src/soap/soap_device.c 2005-11-05 20:44:41.000000000 +0100 +@@ -221,17 +221,20 @@ + + // make headers + membuffer_init( &headers ); ++/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ + if( http_MakeMessage( &headers, major, minor, +- "RNsDsSc" "sssss", ++ "RNsDsSXc" "sssss", + 500, + content_length, + ContentTypeHeader, + "EXT:\r\n", ++ X_USER_AGENT, + start_body, err_code_str, mid_body, err_msg, + end_body ) != 0 ) { + membuffer_destroy( &headers ); + return; // out of mem + } ++/*-- PATCH END - */ + // send err msg + http_SendMessage( info, &timeout_secs, "b", + headers.buf, headers.length ); +@@ -285,16 +288,21 @@ + + // make headers + membuffer_init( &response ); ++ ++/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ + if( http_MakeMessage( &response, major, minor, +- "RNsDsSc" "sss", ++ "RNsDsSXcc" "sss", + HTTP_OK, + content_length, + ContentTypeHeader, + "EXT:\r\n", ++ X_USER_AGENT, + start_body, var_value, end_body ) != 0 ) { + membuffer_destroy( &response ); + return; // out of mem + } ++/* -- PATCH END - */ ++ + // send msg + http_SendMessage( info, &timeout_secs, "b", + response.buf, response.length ); +@@ -704,11 +712,14 @@ + strlen( end_body ); + + // make headers +- if( http_MakeMessage( &headers, major, minor, "RNsDsSc", HTTP_OK, // status code +- content_length, ContentTypeHeader, "EXT:\r\n" // EXT header ++/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ ++ if( http_MakeMessage( &headers, major, minor, "RNsDsSXcc", HTTP_OK, // status code ++ content_length, ContentTypeHeader, "EXT:\r\n", X_USER_AGENT // EXT header + ) != 0 ) { + goto error_handler; + } ++/* -- PATCH END - */ ++ + // send whole msg + ret_code = http_SendMessage( info, &timeout_secs, "bbbb", + headers.buf, headers.length, +diff -Naur ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c upnp/src/ssdp/ssdp_device.c +--- ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c 2003-02-13 17:19:21.000000000 +0100 ++++ upnp/src/ssdp/ssdp_device.c 2005-11-05 21:04:52.000000000 +0100 +@@ -290,12 +290,16 @@ + *packet = NULL; + + if( msg_type == MSGTYPE_REPLY ) { ++/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ + ret_code = http_MakeMessage( &buf, 1, 1, +- "R" "sdc" "D" "s" "ssc" "S" "ssc" ++ "R" "sdc" "D" "s" "ssc" "S" "Xc" "ssc" + "ssc" "c", HTTP_OK, + "CACHE-CONTROL: max-age=", duration, + "EXT:\r\n", "LOCATION: ", location, ++ X_USER_AGENT, + "ST: ", nt, "USN: ", usn ); ++/* -- PATCH END - */ ++ + if( ret_code != 0 ) { + return; + } +@@ -310,14 +314,16 @@ + + // NOTE: The CACHE-CONTROL and LOCATION headers are not present in + // a shutdown msg, but are present here for MS WinMe interop. +- ++ ++/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ + ret_code = http_MakeMessage( &buf, 1, 1, + "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" +- "S" "ssc" "c", HTTPMETHOD_NOTIFY, "*", ++ "S" "Xc" "ssc" "c", HTTPMETHOD_NOTIFY, "*", + 1, "HOST: ", SSDP_IP, ":", SSDP_PORT, + "CACHE-CONTROL: max-age=", duration, + "LOCATION: ", location, "NT: ", nt, +- "NTS: ", nts, "USN: ", usn ); ++ "NTS: ", nts, X_USER_AGENT, "USN: ", usn ); ++/* -- PATCH END - */ + if( ret_code != 0 ) { + return; + } diff --git a/libupnp_ixml_FC4.patch b/libupnp_ixml_FC4.patch new file mode 100644 index 0000000..598cf01 --- /dev/null +++ b/libupnp_ixml_FC4.patch @@ -0,0 +1,18 @@ +--- ../libupnp-1.2.1a/ixml/src/element.c 2003-02-13 17:18:51.000000000 +0100 ++++ ixml/src/element.c 2005-11-05 20:47:25.000000000 +0100 +@@ -454,9 +454,12 @@ + element->n.firstAttr = nextSib; + } + +- ( IXML_Attr * ) attrNode->parentNode = NULL; +- ( IXML_Attr * ) attrNode->prevSibling = NULL; +- ( IXML_Attr * ) attrNode->nextSibling = NULL; ++ // removed the casts, else it did not compile on FC4 ++ // Sergey 'Jin' Bostandzhyan ++ attrNode->parentNode = NULL; ++ attrNode->prevSibling = NULL; ++ attrNode->nextSibling = NULL; ++ + *rtAttr = ( IXML_Attr * ) attrNode; + return IXML_SUCCESS; + diff --git a/libupnp_performance.patch b/libupnp_performance.patch new file mode 100644 index 0000000..5fba780 --- /dev/null +++ b/libupnp_performance.patch @@ -0,0 +1,20 @@ +--- libupnp-1.2.1a/upnp/inc/config.h 2003-02-13 17:19:02.000000000 +0100 ++++ libupnp-1.2.1a/upnp/inc/config.h 2005-03-08 21:26:25.000000000 +0100 +@@ -65,7 +65,7 @@ + */ + + //@{ +-#define JOBS_PER_THREAD 10 ++#define JOBS_PER_THREAD 1 + //@} + + /** @name MIN_THREADS +@@ -78,7 +78,7 @@ + */ + + //@{ +-#define MIN_THREADS 2 ++#define MIN_THREADS 4 + //@} + + /** @name MAX_THREADS diff --git a/sources b/sources index e69de29..e77ce04 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz From 284991fd3fe3bbb7218eead6d3e08da71ff263bb Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 10 Feb 2006 21:43:08 +0000 Subject: [PATCH 02/63] auto-import libupnp-1.2.1a-5 on branch devel from libupnp-1.2.1a-5.src.rpm --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 722ea1d..99d91f7 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.2.1a Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ @@ -83,6 +83,9 @@ make -C threadutil PREFIX=%{buildroot} install rm -rf %{buildroot} %changelog +* Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 +- Rebuild for FC5 + * Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 From 4f8630bc1553014a135bb770d3c837f0e2e1aeab Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 14 Feb 2006 21:53:28 +0000 Subject: [PATCH 03/63] auto-import libupnp-1.2.1a-6 on branch devel from libupnp-1.2.1a-6.src.rpm --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 99d91f7..2cb210f 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.2.1a Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ @@ -83,6 +83,9 @@ make -C threadutil PREFIX=%{buildroot} install rm -rf %{buildroot} %changelog +* Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 +- Rebuild for FC5 + * Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 - Rebuild for FC5 From f6936bdb2a973e9f7b695349c7ae86eafe6c5420 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 6 Mar 2006 17:00:15 +0000 Subject: [PATCH 04/63] auto-import libupnp-1.3.1-1 on branch devel from libupnp-1.3.1-1.src.rpm --- .cvsignore | 2 +- libupnp.spec | 58 +++----- libupnp_dsm_320.patch | 301 -------------------------------------- libupnp_ixml_FC4.patch | 18 --- libupnp_performance.patch | 20 --- sources | 2 +- 6 files changed, 22 insertions(+), 379 deletions(-) delete mode 100644 libupnp_dsm_320.patch delete mode 100644 libupnp_ixml_FC4.patch delete mode 100644 libupnp_performance.patch diff --git a/.cvsignore b/.cvsignore index 0c025ad..b088e2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz diff --git a/libupnp.spec b/libupnp.spec index 2cb210f..c40ca7f 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 6%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,46 @@ the UPnP SDK libraries. %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 - Rebuild for FC5 diff --git a/libupnp_dsm_320.patch b/libupnp_dsm_320.patch deleted file mode 100644 index a54a99f..0000000 --- a/libupnp_dsm_320.patch +++ /dev/null @@ -1,301 +0,0 @@ -diff -Naur ../libupnp-1.2.1a/upnp/inc/config.h upnp/inc/config.h ---- ../libupnp-1.2.1a/upnp/inc/config.h 2003-02-13 17:19:02.000000000 +0100 -+++ upnp/inc/config.h 2005-11-05 20:42:25.000000000 +0100 -@@ -56,6 +56,17 @@ - #define THREAD_IDLE_TIME 5000 - //@} - -+/** @name X_USER_AGENT -+ * The {\tt X_USER_AGENT} constant specifies the value of the X-User-Agent: -+ * HTTP header. The value "redsonic" is needed for the DSM-320. See -+ * https://sourceforge.net/forum/message.php?msg_id=3166856 for more -+ * information -+ */ -+ -+//@{ -+#define X_USER_AGENT "redsonic" -+//@} -+ - /** @name JOBS_PER_THREAD - * The {\tt JOBS_PER_THREAD} constant determines when a new thread will be - * allocated to the thread pool inside the SDK. The thread pool will -diff -Naur ../libupnp-1.2.1a/upnp/src/gena/gena_device.c upnp/src/gena/gena_device.c ---- ../libupnp-1.2.1a/upnp/src/gena/gena_device.c 2003-02-13 17:19:11.000000000 +0100 -+++ upnp/src/gena/gena_device.c 2005-11-05 20:18:42.000000000 +0100 -@@ -1164,10 +1164,16 @@ - - membuffer_init( &response ); - response.size_inc = 30; -+/* - PATCH START - Sergey 'Jin' Bostandzhyan -+ * added X-User-Agent header -+ */ - if( http_MakeMessage( &response, major, minor, -- "R" "D" "S" "ssc" "sc" "c", -+ "R" "D" "S" "Xc" "ssc" "sc" "c", - HTTP_OK, -- "SID: ", sub->sid, timeout_str ) != 0 ) { -+ X_USER_AGENT, -+ "SID: ", sub->sid, timeout_str ) != 0 ) -+/* - PATCH END --- */ -+ { - membuffer_destroy( &response ); - error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request ); - return UPNP_E_OUTOF_MEMORY; -diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c upnp/src/genlib/net/http/httpreadwrite.c ---- ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c 2003-02-13 17:19:13.000000000 +0100 -+++ upnp/src/genlib/net/http/httpreadwrite.c 2005-11-05 20:04:51.000000000 +0100 -@@ -1632,6 +1632,9 @@ - * appends content-length, content-type and HTML body for given code - * 'T': arg = char * content_type; format e.g: "text/html"; - * content-type header -+* --- PATCH START - Sergey 'Jin' Bostandzhyan -+* 'X': arg = const char useragent; "redsonic" HTTP X-User-Agent: useragent -+* --- PATCH END --- - * - * Return : int; - * 0 - On Success -@@ -1800,6 +1803,24 @@ - } - } - -+/* --- PATCH START - Sergey 'Jin' Bostandzhyan */ -+ if( c == 'X' ) // C string -+ { -+ s = ( char * )va_arg( argp, char * ); -+ -+ assert( s ); -+ -+ if( membuffer_append_str( buf, "X-User-Agent: ") != 0 ) { -+ goto error_handler; -+ } -+ if( membuffer_append( buf, s, strlen( s ) ) != 0 ) { -+ goto error_handler; -+ } -+ } -+ -+/* --- PATCH END --- */ -+ -+ - else if( c == 'R' ) { - // response start line - // e.g.: 'HTTP/1.1 200 OK' -diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c upnp/src/genlib/net/http/webserver.c ---- ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c 2003-02-13 17:19:14.000000000 +0100 -+++ upnp/src/genlib/net/http/webserver.c 2005-11-05 20:53:56.000000000 +0100 -@@ -1368,16 +1368,22 @@ - } - - if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) { -+ -+/* - PATCH START - Sergey 'Jin' Bostandzhyan -+ * added X-User-Agent header -+ */ -+ - //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT - //Transfer-Encoding: chunked - // K means add chunky header ang G means range header. -- if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSCc", HTTP_PARTIAL_CONTENT, // status code -+ if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code - // RespInstr->ReadSendSize,// content length - finfo.content_type, - // content_type.buf, // content type - RespInstr, // Range - "LAST-MODIFIED: ", -- &finfo.last_modified ) != 0 ) { -+ &finfo.last_modified, -+ X_USER_AGENT) != 0 ) { - goto error_handler; - } - } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) { -@@ -1385,13 +1391,14 @@ - //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT - //Transfer-Encoding: chunked - // K means add chunky header ang G means range header. -- if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSCc", HTTP_PARTIAL_CONTENT, // status code -+ if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code - RespInstr->ReadSendSize, // content length - finfo.content_type, - //content_type.buf, // content type - RespInstr, //Range Info - "LAST-MODIFIED: ", -- &finfo.last_modified ) != 0 ) { -+ &finfo.last_modified, -+ X_USER_AGENT) != 0 ) { - goto error_handler; - } - -@@ -1400,12 +1407,13 @@ - //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT - //Transfer-Encoding: chunked - // K means add chunky header ang G means range header. -- if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSCc", HTTP_OK, // status code -+ if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSXcCc", HTTP_OK, // status code - //RespInstr->ReadSendSize,// content length - finfo.content_type, - // content_type.buf, // content type - "LAST-MODIFIED: ", -- &finfo.last_modified ) != 0 ) { -+ &finfo.last_modified, -+ X_USER_AGENT) != 0 ) { - goto error_handler; - } - -@@ -1414,28 +1422,31 @@ - //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT - //Transfer-Encoding: chunked - // K means add chunky header ang G means range header. -- if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSCc", HTTP_OK, // status code -+ if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSXcCc", HTTP_OK, // status code - RespInstr->ReadSendSize, // content length - finfo.content_type, - //content_type.buf, // content type - "LAST-MODIFIED: ", -- &finfo.last_modified ) != 0 ) { -+ &finfo.last_modified, -+ X_USER_AGENT) != 0 ) { - goto error_handler; - } - } else { - //Content-Range: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT - //Transfer-Encoding: chunked - // K means add chunky header ang G means range header. -- if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSCc", HTTP_OK, // status code -+ if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSXcCc", HTTP_OK, // status code - //RespInstr->ReadSendSize,// content length - finfo.content_type, - //content_type.buf, // content type - "LAST-MODIFIED: ", -- &finfo.last_modified ) != 0 ) { -+ &finfo.last_modified, -+ X_USER_AGENT) != 0 ) { - goto error_handler; - } - } - } -+/* -- PATCH END -- */ - - if( req->method == HTTPMETHOD_HEAD ) { - *rtype = RESP_HEADERS; -@@ -1717,8 +1728,14 @@ - http_RecvPostMessage( parser, info, filename.buf, - &RespInstr ); - //Send response. -- http_MakeMessage( &headers, 1, 1, "RTDSCc", ret, -- "text/html" ); -+ -+/* - PATCH START - Sergey 'Jin' Bostandzhyan -+ * added X-User-Agent header -+ */ -+ http_MakeMessage( &headers, 1, 1, "RTDSXcCc", ret, -+ "text/html", X_USER_AGENT ); -+/* - PATCH END --- */ -+ - http_SendMessage( info, &timeout, "b", headers.buf, - headers.length ); - break; -diff -Naur ../libupnp-1.2.1a/upnp/src/soap/soap_device.c upnp/src/soap/soap_device.c ---- ../libupnp-1.2.1a/upnp/src/soap/soap_device.c 2003-02-13 17:19:20.000000000 +0100 -+++ upnp/src/soap/soap_device.c 2005-11-05 20:44:41.000000000 +0100 -@@ -221,17 +221,20 @@ - - // make headers - membuffer_init( &headers ); -+/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ - if( http_MakeMessage( &headers, major, minor, -- "RNsDsSc" "sssss", -+ "RNsDsSXc" "sssss", - 500, - content_length, - ContentTypeHeader, - "EXT:\r\n", -+ X_USER_AGENT, - start_body, err_code_str, mid_body, err_msg, - end_body ) != 0 ) { - membuffer_destroy( &headers ); - return; // out of mem - } -+/*-- PATCH END - */ - // send err msg - http_SendMessage( info, &timeout_secs, "b", - headers.buf, headers.length ); -@@ -285,16 +288,21 @@ - - // make headers - membuffer_init( &response ); -+ -+/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ - if( http_MakeMessage( &response, major, minor, -- "RNsDsSc" "sss", -+ "RNsDsSXcc" "sss", - HTTP_OK, - content_length, - ContentTypeHeader, - "EXT:\r\n", -+ X_USER_AGENT, - start_body, var_value, end_body ) != 0 ) { - membuffer_destroy( &response ); - return; // out of mem - } -+/* -- PATCH END - */ -+ - // send msg - http_SendMessage( info, &timeout_secs, "b", - response.buf, response.length ); -@@ -704,11 +712,14 @@ - strlen( end_body ); - - // make headers -- if( http_MakeMessage( &headers, major, minor, "RNsDsSc", HTTP_OK, // status code -- content_length, ContentTypeHeader, "EXT:\r\n" // EXT header -+/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ -+ if( http_MakeMessage( &headers, major, minor, "RNsDsSXcc", HTTP_OK, // status code -+ content_length, ContentTypeHeader, "EXT:\r\n", X_USER_AGENT // EXT header - ) != 0 ) { - goto error_handler; - } -+/* -- PATCH END - */ -+ - // send whole msg - ret_code = http_SendMessage( info, &timeout_secs, "bbbb", - headers.buf, headers.length, -diff -Naur ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c upnp/src/ssdp/ssdp_device.c ---- ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c 2003-02-13 17:19:21.000000000 +0100 -+++ upnp/src/ssdp/ssdp_device.c 2005-11-05 21:04:52.000000000 +0100 -@@ -290,12 +290,16 @@ - *packet = NULL; - - if( msg_type == MSGTYPE_REPLY ) { -+/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ - ret_code = http_MakeMessage( &buf, 1, 1, -- "R" "sdc" "D" "s" "ssc" "S" "ssc" -+ "R" "sdc" "D" "s" "ssc" "S" "Xc" "ssc" - "ssc" "c", HTTP_OK, - "CACHE-CONTROL: max-age=", duration, - "EXT:\r\n", "LOCATION: ", location, -+ X_USER_AGENT, - "ST: ", nt, "USN: ", usn ); -+/* -- PATCH END - */ -+ - if( ret_code != 0 ) { - return; - } -@@ -310,14 +314,16 @@ - - // NOTE: The CACHE-CONTROL and LOCATION headers are not present in - // a shutdown msg, but are present here for MS WinMe interop. -- -+ -+/* -- PATCH START - Sergey 'Jin' Bostandzhyan */ - ret_code = http_MakeMessage( &buf, 1, 1, - "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" -- "S" "ssc" "c", HTTPMETHOD_NOTIFY, "*", -+ "S" "Xc" "ssc" "c", HTTPMETHOD_NOTIFY, "*", - 1, "HOST: ", SSDP_IP, ":", SSDP_PORT, - "CACHE-CONTROL: max-age=", duration, - "LOCATION: ", location, "NT: ", nt, -- "NTS: ", nts, "USN: ", usn ); -+ "NTS: ", nts, X_USER_AGENT, "USN: ", usn ); -+/* -- PATCH END - */ - if( ret_code != 0 ) { - return; - } diff --git a/libupnp_ixml_FC4.patch b/libupnp_ixml_FC4.patch deleted file mode 100644 index 598cf01..0000000 --- a/libupnp_ixml_FC4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ../libupnp-1.2.1a/ixml/src/element.c 2003-02-13 17:18:51.000000000 +0100 -+++ ixml/src/element.c 2005-11-05 20:47:25.000000000 +0100 -@@ -454,9 +454,12 @@ - element->n.firstAttr = nextSib; - } - -- ( IXML_Attr * ) attrNode->parentNode = NULL; -- ( IXML_Attr * ) attrNode->prevSibling = NULL; -- ( IXML_Attr * ) attrNode->nextSibling = NULL; -+ // removed the casts, else it did not compile on FC4 -+ // Sergey 'Jin' Bostandzhyan -+ attrNode->parentNode = NULL; -+ attrNode->prevSibling = NULL; -+ attrNode->nextSibling = NULL; -+ - *rtAttr = ( IXML_Attr * ) attrNode; - return IXML_SUCCESS; - diff --git a/libupnp_performance.patch b/libupnp_performance.patch deleted file mode 100644 index 5fba780..0000000 --- a/libupnp_performance.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libupnp-1.2.1a/upnp/inc/config.h 2003-02-13 17:19:02.000000000 +0100 -+++ libupnp-1.2.1a/upnp/inc/config.h 2005-03-08 21:26:25.000000000 +0100 -@@ -65,7 +65,7 @@ - */ - - //@{ --#define JOBS_PER_THREAD 10 -+#define JOBS_PER_THREAD 1 - //@} - - /** @name MIN_THREADS -@@ -78,7 +78,7 @@ - */ - - //@{ --#define MIN_THREADS 2 -+#define MIN_THREADS 4 - //@} - - /** @name MAX_THREADS diff --git a/sources b/sources index e77ce04..152bb26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz From 0f5b54473908245f79343361c9f8566f3a7235b2 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 23 Jun 2006 06:58:57 +0000 Subject: [PATCH 05/63] auto-import libupnp-1.4.0-1 on branch devel from libupnp-1.4.0-1.src.rpm --- .cvsignore | 3 ++- libupnp.spec | 39 ++++++++++++++++++++++++++++++--------- sources | 3 ++- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index b088e2a..bb0e667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -libupnp-1.3.1.tar.gz +UPnP_1_4_0_Programming_Guide.pdf +libupnp-1.4.0.tar.gz diff --git a/libupnp.spec b/libupnp.spec index c40ca7f..4cb38b1 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,13 +1,17 @@ -Version: 1.3.1 +Version: 1.4.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} License: BSD Group: System Environment/Libraries -URL: http://upnp.sourceforge.net/ -Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz +URL: http://www.libupnp.org/ +Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz +Source1: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/UPnP_1_4_0_Programming_Guide.pdf Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define docdir %{_docdir}/%{name}-%{version}-%{release} +%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release} + %description The Universal Plug and Play (UPnP) SDK for Linux provides support for building UPnP-compliant control points, devices, @@ -25,30 +29,44 @@ the UPnP SDK libraries. %prep %setup -q -chmod 644 {LICENSE,README} +#chmod 644 {LICENSE,README} %build -%configure +%configure --with-docdir=%{docdir}/ make %{?_smp_mflags} %install -rm -rf %{buildroot} -%makeinstall +test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +#delete the empty pdf +%{__rm} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf + +#create the doc devel dir +%{__mkdir_p} %{buildroot}%{docdeveldir} + +#mv examples dir to he doc devel dir +%{__mv} %{buildroot}%{docdir}/examples \ + %{buildroot}%{docdeveldir}/ + +#install the right pdf in the doc devel dir +install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_Guide.pdf + +%{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} -rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README NEWS +%doc %{docdir} %{_libdir}/libixml.so.* %{_libdir}/libthreadutil.so.* %{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) +%doc %{docdeveldir} %{_includedir}/upnp/ %{_libdir}/libixml.so %{_libdir}/libthreadutil.so @@ -62,6 +80,9 @@ rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} rm -rf %{buildroot} %changelog +* Sun Jun 11 2006 Eric Tanguy - 1.4.0-1 +- Update to 1.4.0 + * Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 - Update to 1.3.1 diff --git a/sources b/sources index 152bb26..1bb24e7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz +4d8e49398a277ed83391e56bbf7e6831 UPnP_1_4_0_Programming_Guide.pdf +581c8017dc1b36d29ba034ce1e178c83 libupnp-1.4.0.tar.gz From d9b0a899538a5e9e523291dd79ae2440c49fcc10 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 23 Jun 2006 21:13:50 +0000 Subject: [PATCH 06/63] auto-import libupnp-1.4.0-2 on branch devel from libupnp-1.4.0-2.src.rpm --- libupnp.spec | 7 ++++++- libupnparch.diff | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libupnparch.diff diff --git a/libupnp.spec b/libupnp.spec index 4cb38b1..d78d204 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,12 +1,13 @@ Version: 1.4.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz Source1: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/UPnP_1_4_0_Programming_Guide.pdf +Patch0: libupnparch.diff Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdir %{_docdir}/%{name}-%{version}-%{release} @@ -28,6 +29,7 @@ the UPnP SDK libraries. %prep %setup -q +%patch0 -p1 #chmod 644 {LICENSE,README} @@ -80,6 +82,9 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_G rm -rf %{buildroot} %changelog +* Fri Jun 23 2006 Eric Tanguy - 1.4.0-2 +- Add a patch for x86_64 arch + * Sun Jun 11 2006 Eric Tanguy - 1.4.0-1 - Update to 1.4.0 diff --git a/libupnparch.diff b/libupnparch.diff new file mode 100644 index 0000000..7b8f5d1 --- /dev/null +++ b/libupnparch.diff @@ -0,0 +1,11 @@ +--- libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-06 07:37:44.000000000 +0200 ++++ libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-23 23:06:21.000000000 +0200 +@@ -387,7 +387,7 @@ + const char *Arg, + ... ) + { +- va_list ArgList=NULL; ++ va_list ArgList; + IXML_Document *out = NULL; + + if( NumArg > 0 ) { From ca1626b688d2ae8e74ba867d6480c80cc89c0708 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 26 Jun 2006 18:27:50 +0000 Subject: [PATCH 07/63] auto-import libupnp-1.4.0-3 on branch devel from libupnp-1.4.0-3.src.rpm --- libupnp.spec | 5 ++++- libupnparch.diff | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index d78d204..5832bce 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.4.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -82,6 +82,9 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_G rm -rf %{buildroot} %changelog +* Fri Jun 23 2006 Eric Tanguy - 1.4.0-3 +- modified patch for x86_64 arch + * Fri Jun 23 2006 Eric Tanguy - 1.4.0-2 - Add a patch for x86_64 arch diff --git a/libupnparch.diff b/libupnparch.diff index 7b8f5d1..df50c31 100644 --- a/libupnparch.diff +++ b/libupnparch.diff @@ -1,5 +1,14 @@ --- libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-06 07:37:44.000000000 +0200 -+++ libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-23 23:06:21.000000000 +0200 ++++ libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-26 20:19:51.000000000 +0200 +@@ -345,7 +345,7 @@ + const char *Arg, + ... ) + { +- va_list ArgList=NULL; ++ va_list ArgList; + IXML_Document *out = NULL; + + if( NumArg > 0 ) { @@ -387,7 +387,7 @@ const char *Arg, ... ) From 342b3d2977cb34080da832cc4a59cc8c5da468f8 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 14 Aug 2006 16:14:39 +0000 Subject: [PATCH 08/63] auto-import libupnp-1.4.1-1 on branch devel from libupnp-1.4.1-1.src.rpm --- .cvsignore | 3 +-- libupnp.spec | 27 +++++++++++++-------------- libupnparch.diff | 20 -------------------- sources | 3 +-- 4 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 libupnparch.diff diff --git a/.cvsignore b/.cvsignore index bb0e667..5daa0e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -UPnP_1_4_0_Programming_Guide.pdf -libupnp-1.4.0.tar.gz +libupnp-1.4.1.tar.gz diff --git a/libupnp.spec b/libupnp.spec index 5832bce..c087e43 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,13 +1,11 @@ -Version: 1.4.0 +Version: 1.4.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz -Source1: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/UPnP_1_4_0_Programming_Guide.pdf -Patch0: libupnparch.diff Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdir %{_docdir}/%{name}-%{version}-%{release} @@ -29,29 +27,27 @@ the UPnP SDK libraries. %prep %setup -q -%patch0 -p1 - -#chmod 644 {LICENSE,README} %build -%configure --with-docdir=%{docdir}/ +%configure --with-docdir=%{docdir}/ make %{?_smp_mflags} %install test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#delete the empty pdf -%{__rm} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf #create the doc devel dir %{__mkdir_p} %{buildroot}%{docdeveldir} -#mv examples dir to he doc devel dir +#mv examples dir and pdf file to the doc devel dir %{__mv} %{buildroot}%{docdir}/examples \ %{buildroot}%{docdeveldir}/ - -#install the right pdf in the doc devel dir -install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_Guide.pdf +%{__mv} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf \ + %{buildroot}%{docdeveldir}/ +%{__mv} %{buildroot}%{docdir}/IXML_Programming_Guide.pdf \ + %{buildroot}%{docdeveldir}/ +%{__mv} %{buildroot}%{docdir}/html \ + %{buildroot}%{docdeveldir}/ %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} @@ -82,6 +78,9 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_G rm -rf %{buildroot} %changelog +* Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 +- Update to version 1.4.1 + * Fri Jun 23 2006 Eric Tanguy - 1.4.0-3 - modified patch for x86_64 arch diff --git a/libupnparch.diff b/libupnparch.diff deleted file mode 100644 index df50c31..0000000 --- a/libupnparch.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-06 07:37:44.000000000 +0200 -+++ libupnp-1.4.0/upnp/src/api/upnptools.c 2006-06-26 20:19:51.000000000 +0200 -@@ -345,7 +345,7 @@ - const char *Arg, - ... ) - { -- va_list ArgList=NULL; -+ va_list ArgList; - IXML_Document *out = NULL; - - if( NumArg > 0 ) { -@@ -387,7 +387,7 @@ - const char *Arg, - ... ) - { -- va_list ArgList=NULL; -+ va_list ArgList; - IXML_Document *out = NULL; - - if( NumArg > 0 ) { diff --git a/sources b/sources index 1bb24e7..5694b06 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4d8e49398a277ed83391e56bbf7e6831 UPnP_1_4_0_Programming_Guide.pdf -581c8017dc1b36d29ba034ce1e178c83 libupnp-1.4.0.tar.gz +f3b55c24ff77ee6789d758ec1634d5e7 libupnp-1.4.1.tar.gz From be6a550b7be2ae2c8fb9e8577cba66d999ec6d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:38:13 +0000 Subject: [PATCH 09/63] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From ac5950f7cd4e7692a80b621ff4c01b5cd12cd5bc Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 28 Aug 2006 07:10:23 +0000 Subject: [PATCH 10/63] *** empty log message *** --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index c087e43..b0685fb 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.4.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -78,6 +78,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Mon Aug 28 2006 Eric Tanguy - 1.4.1-2 +- Rebuild for Fedora Extras 6 + * Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 - Update to version 1.4.1 From 12dd9a359a4ed2a5a29fd28bede6178d998e4ff5 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 28 Aug 2006 17:44:37 +0000 Subject: [PATCH 11/63] *** empty log message *** --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 09404eea7c0ef788bd31158803b959fc80f65d04 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sat, 17 Feb 2007 10:06:54 +0000 Subject: [PATCH 12/63] auto-import libupnp-1.4.2-1 on branch devel from libupnp-1.4.2-1.src.rpm --- .cvsignore | 2 +- libupnp.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5daa0e2..a35f25c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.4.1.tar.gz +libupnp-1.4.2.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index b0685fb..a3291d1 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,15 +1,15 @@ -Version: 1.4.1 +Version: 1.4.2 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ -Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define docdir %{_docdir}/%{name}-%{version}-%{release} -%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release} +%define docdeveldir %{_docdir}/%{name}-devel-%{version} +%define docdir %{_docdir}/%{name}-%{version} %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -29,7 +29,7 @@ the UPnP SDK libraries. %setup -q %build -%configure --with-docdir=%{docdir}/ +%configure --with-documentation make %{?_smp_mflags} %install @@ -78,8 +78,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog -* Mon Aug 28 2006 Eric Tanguy - 1.4.1-2 -- Rebuild for Fedora Extras 6 +* Fri Feb 02 2007 Eric Tanguy - 1.4.2-1 +- Update to version 1.4.2 * Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 - Update to version 1.4.1 diff --git a/sources b/sources index 5694b06..19db934 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3b55c24ff77ee6789d758ec1634d5e7 libupnp-1.4.1.tar.gz +6f760cf67132a5aab8b7dfa56456fd42 libupnp-1.4.2.tar.bz2 From da09cb8a6e08670059758ce720c33528f28a43a4 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 6 Mar 2007 20:55:40 +0000 Subject: [PATCH 13/63] auto-import libupnp-1.4.3-1 on branch devel from libupnp-1.4.3-1.src.rpm --- .cvsignore | 2 +- libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a35f25c..5999909 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.4.2.tar.bz2 +libupnp-1.4.3.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index a3291d1..6aecf22 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.4.2 +Version: 1.4.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -78,6 +78,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue Mar 06 2007 Eric Tanguy - 1.4.3-1 +- Update to version 1.4.3 + * Fri Feb 02 2007 Eric Tanguy - 1.4.2-1 - Update to version 1.4.2 diff --git a/sources b/sources index 19db934..7305740 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f760cf67132a5aab8b7dfa56456fd42 libupnp-1.4.2.tar.bz2 +c87ba0840b78dfb3163c2d0d4e9cff9b libupnp-1.4.3.tar.bz2 From 916d78204fa330c00b2d047cde02dfaa17a22dec Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sat, 5 May 2007 15:44:55 +0000 Subject: [PATCH 14/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5999909..1af2a29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.4.3.tar.bz2 +libupnp-1.4.6.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 6aecf22..54dc7ea 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.4.3 +Version: 1.4.6 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -78,6 +78,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue May 01 2007 Eric Tanguy - 1.4.6-1 +- Update to version 1.4.6 + +* Sat Apr 21 2007 Eric Tanguy - 1.4.4-1 +- Update to version 1.4.4 + * Tue Mar 06 2007 Eric Tanguy - 1.4.3-1 - Update to version 1.4.3 diff --git a/sources b/sources index 7305740..2ec933e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c87ba0840b78dfb3163c2d0d4e9cff9b libupnp-1.4.3.tar.bz2 +8a7d58ca73e9eb46357b757f45fa6bde libupnp-1.4.6.tar.bz2 From 509961dc482d4fe610d8f0d198a505ebb76f0ad0 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 25 Jun 2007 16:42:39 +0000 Subject: [PATCH 15/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1af2a29..c88d889 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.4.6.tar.bz2 +libupnp-1.6.0.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 54dc7ea..0f3497d 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.4.6 +Version: 1.6.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -78,6 +78,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Jun 13 2007 Eric Tanguy - 1.6.0-1 +- Update to version 1.6.0 + * Tue May 01 2007 Eric Tanguy - 1.4.6-1 - Update to version 1.4.6 diff --git a/sources b/sources index 2ec933e..424add3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a7d58ca73e9eb46357b757f45fa6bde libupnp-1.4.6.tar.bz2 +3185b3fd9d7e8f5a3d29314e8d369c66 libupnp-1.6.0.tar.bz2 From 140305236e80f7eb45cf366bb3487003a39053d8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Aug 2007 05:57:22 +0000 Subject: [PATCH 16/63] - Rebuild for selinux ppc32 issue. --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 0f3497d..f4c581a 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -78,6 +78,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 +- Rebuild for selinux ppc32 issue. + * Wed Jun 13 2007 Eric Tanguy - 1.6.0-1 - Update to version 1.6.0 From 872ce32c9d55329463179b82da90ef274881c395 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 7 Sep 2007 21:35:23 +0000 Subject: [PATCH 17/63] *** empty log message *** --- libupnp.spec | 7 ++++++- open.patch | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 open.patch diff --git a/libupnp.spec b/libupnp.spec index f4c581a..c7c1c4b 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,11 +1,12 @@ Version: 1.6.0 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 +Patch0: open.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdeveldir %{_docdir}/%{name}-devel-%{version} @@ -27,6 +28,7 @@ the UPnP SDK libraries. %prep %setup -q +%patch0 -p1 %build %configure --with-documentation @@ -78,6 +80,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Fri Sep 07 2007 Eric Tanguy - 1.6.0-3 +- Patch to build with new glibc + * Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 - Rebuild for selinux ppc32 issue. diff --git a/open.patch b/open.patch new file mode 100644 index 0000000..88e03d0 --- /dev/null +++ b/open.patch @@ -0,0 +1,24 @@ +diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c libupnp-1.6.0/upnp/src/genlib/net/http-new/httpreadwrite.c +--- libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c 2007-05-23 15:18:08.000000000 +0200 ++++ libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c 2007-09-01 16:18:33.000000000 +0200 +@@ -349,7 +349,7 @@ + filename = ( char * )va_arg( argp, char * ); + + if( Instr && Instr->IsVirtualFile ) +- Fp = virtualDirCallback.open( filename, UPNP_READ ); ++ Fp = (virtualDirCallback.open)( filename, UPNP_READ ); + else + Fp = fopen( filename, "rb" ); + +diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c libupnp-1.6.0/upnp/src/genlib/net/http-new/webserver.c +--- libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c 2007-05-23 15:18:08.000000000 +0200 ++++ libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c 2007-09-01 16:18:33.000000000 +0200 +@@ -1531,7 +1531,7 @@ + + if( Instr && Instr->IsVirtualFile ) { + +- Fp = virtualDirCallback.open( filename, UPNP_WRITE ); ++ Fp = (virtualDirCallback.open)( filename, UPNP_WRITE ); + if( Fp == NULL ) { + return HTTP_INTERNAL_SERVER_ERROR; + } From 569ef6870a9b01f61589a2710dbd7260ec3f02c0 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 18 Nov 2007 17:13:07 +0000 Subject: [PATCH 18/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 10 ++++------ sources | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index c88d889..697d03b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.0.tar.bz2 +libupnp-1.6.1.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index c7c1c4b..fa66ca7 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,12 +1,11 @@ -Version: 1.6.0 +Version: 1.6.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 -Patch0: open.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdeveldir %{_docdir}/%{name}-devel-%{version} @@ -28,7 +27,6 @@ the UPnP SDK libraries. %prep %setup -q -%patch0 -p1 %build %configure --with-documentation @@ -80,8 +78,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog -* Fri Sep 07 2007 Eric Tanguy - 1.6.0-3 -- Patch to build with new glibc +* Sun Nov 18 2007 Eric Tanguy - 1.6.1-1 +- Update to version 1.6.1 * Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 - Rebuild for selinux ppc32 issue. diff --git a/sources b/sources index 424add3..3e0b48f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3185b3fd9d7e8f5a3d29314e8d369c66 libupnp-1.6.0.tar.bz2 +eb7adc11f9d487b47f348be2895faa82 libupnp-1.6.1.tar.bz2 From 0be63621263ed0c6e783791a9e333795409deb78 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Thu, 13 Dec 2007 18:45:03 +0000 Subject: [PATCH 19/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 697d03b..d66e3a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.1.tar.bz2 +libupnp-1.6.2.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index fa66ca7..406bf9a 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.1 +Version: 1.6.2 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -6,7 +6,9 @@ License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 +#Patch0: open.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gawk, gcc-gfortran %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} @@ -27,6 +29,7 @@ the UPnP SDK libraries. %prep %setup -q +#%patch0 -p1 %build %configure --with-documentation @@ -78,6 +81,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu Dec 13 2007 Eric Tanguy - 1.6.2-1 +- Update to version 1.6.2 + * Sun Nov 18 2007 Eric Tanguy - 1.6.1-1 - Update to version 1.6.1 diff --git a/sources b/sources index 3e0b48f..7a509d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb7adc11f9d487b47f348be2895faa82 libupnp-1.6.1.tar.bz2 +7389ff8aad5461ef97361572e5fea92b libupnp-1.6.2.tar.bz2 From b5cbc5a88dff21e09a63d813a623be8103cb7c3e Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 30 Dec 2007 09:05:17 +0000 Subject: [PATCH 20/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d66e3a8..f884bf3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.2.tar.bz2 +libupnp-1.6.3.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 406bf9a..5c9279b 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.2 +Version: 1.6.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -81,6 +81,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Dec 30 2007 Eric Tanguy - 1.6.3-1 +- Update to version 1.6.3 + * Thu Dec 13 2007 Eric Tanguy - 1.6.2-1 - Update to version 1.6.2 diff --git a/sources b/sources index 7a509d9..7a4d76c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7389ff8aad5461ef97361572e5fea92b libupnp-1.6.2.tar.bz2 +553f3491fe4da88aba1763497730e2c0 libupnp-1.6.3.tar.bz2 From 7e18e0d4223fd63be62ac1f9149d3d0ed191827f Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 30 Dec 2007 15:38:31 +0000 Subject: [PATCH 21/63] *** empty log message *** --- libupnp.spec | 8 ++++---- open.patch | 24 ------------------------ 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 open.patch diff --git a/libupnp.spec b/libupnp.spec index 5c9279b..019e6a2 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,14 +1,12 @@ Version: 1.6.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 -#Patch0: open.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gawk, gcc-gfortran %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} @@ -29,7 +27,6 @@ the UPnP SDK libraries. %prep %setup -q -#%patch0 -p1 %build %configure --with-documentation @@ -81,6 +78,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Dec 30 2007 Eric Tanguy - 1.6.3-2 +- Spec file cleanup + * Sun Dec 30 2007 Eric Tanguy - 1.6.3-1 - Update to version 1.6.3 diff --git a/open.patch b/open.patch deleted file mode 100644 index 88e03d0..0000000 --- a/open.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c libupnp-1.6.0/upnp/src/genlib/net/http-new/httpreadwrite.c ---- libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c 2007-05-23 15:18:08.000000000 +0200 -+++ libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c 2007-09-01 16:18:33.000000000 +0200 -@@ -349,7 +349,7 @@ - filename = ( char * )va_arg( argp, char * ); - - if( Instr && Instr->IsVirtualFile ) -- Fp = virtualDirCallback.open( filename, UPNP_READ ); -+ Fp = (virtualDirCallback.open)( filename, UPNP_READ ); - else - Fp = fopen( filename, "rb" ); - -diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c libupnp-1.6.0/upnp/src/genlib/net/http-new/webserver.c ---- libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c 2007-05-23 15:18:08.000000000 +0200 -+++ libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c 2007-09-01 16:18:33.000000000 +0200 -@@ -1531,7 +1531,7 @@ - - if( Instr && Instr->IsVirtualFile ) { - -- Fp = virtualDirCallback.open( filename, UPNP_WRITE ); -+ Fp = (virtualDirCallback.open)( filename, UPNP_WRITE ); - if( Fp == NULL ) { - return HTTP_INTERNAL_SERVER_ERROR; - } From 5c2723339688ff1b721f11e0a2a550f35bb9e5ec Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 4 Jan 2008 22:02:49 +0000 Subject: [PATCH 22/63] *** empty log message *** --- libupnp.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index 019e6a2..edca80a 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -29,7 +29,7 @@ the UPnP SDK libraries. %setup -q %build -%configure --with-documentation +%configure --with-documentation --enable-static=no make %{?_smp_mflags} %install @@ -69,15 +69,15 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/libixml.so %{_libdir}/libthreadutil.so %{_libdir}/libupnp.so -%{_libdir}/libixml.a -%{_libdir}/libthreadutil.a -%{_libdir}/libupnp.a %{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Fri Jan 04 2008 Eric Tanguy - 1.6.3-3 +- No more building static library + * Sun Dec 30 2007 Eric Tanguy - 1.6.3-2 - Spec file cleanup From 63b09062abb2753ceb1e58aceb40844f653f3115 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 28 Jan 2008 07:32:05 +0000 Subject: [PATCH 23/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f884bf3..7cb1ec9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.3.tar.bz2 +libupnp-1.6.4.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index edca80a..8017958 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ -Version: 1.6.3 +Version: 1.6.4 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Jan 27 2008 Eric Tanguy - 1.6.4-1 +- Update to version 1.6.4 + * Fri Jan 04 2008 Eric Tanguy - 1.6.3-3 - No more building static library diff --git a/sources b/sources index 7a4d76c..d09195c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -553f3491fe4da88aba1763497730e2c0 libupnp-1.6.3.tar.bz2 +7e6930b8636b2bd832509405d2772963 libupnp-1.6.4.tar.bz2 From 7160ddf125ec36ea126ccd8e697d371a9cc52eae Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 3 Feb 2008 08:48:41 +0000 Subject: [PATCH 24/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7cb1ec9..96110e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.4.tar.bz2 +libupnp-1.6.5.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 8017958..96a7350 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.4 +Version: 1.6.5 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Feb 03 2008 Eric Tanguy - 1.6.5-1 +- Update to version 1.6.5 + * Sun Jan 27 2008 Eric Tanguy - 1.6.4-1 - Update to version 1.6.4 diff --git a/sources b/sources index d09195c..be449d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e6930b8636b2bd832509405d2772963 libupnp-1.6.4.tar.bz2 +2b0370e7c405a5bc80880085e6d7d827 libupnp-1.6.5.tar.bz2 From e36b5033589b7eef687413a2fa0cb1899dd88afd Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Thu, 1 May 2008 16:34:44 +0000 Subject: [PATCH 25/63] *** empty log message *** --- .cvsignore | 2 +- libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 96110e1..3f96adb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libupnp-1.6.5.tar.bz2 +libupnp-1.6.6.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 96a7350..2b39c13 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.5 +Version: 1.6.6 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu May 01 2008 Eric Tanguy - 1.6.6-1 +- Update to version 1.6.6 + * Sun Feb 03 2008 Eric Tanguy - 1.6.5-1 - Update to version 1.6.5 diff --git a/sources b/sources index be449d0..bc0ba35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b0370e7c405a5bc80880085e6d7d827 libupnp-1.6.5.tar.bz2 +8918dcf7428cd119d0c8275765ff2833 libupnp-1.6.6.tar.bz2 From e024607135502c77570da45d90c9201057db38a6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 19:40:04 +0000 Subject: [PATCH 26/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 2b39c13..fe8aba7 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.6 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu May 01 2008 Eric Tanguy - 1.6.6-1 - Update to version 1.6.6 From fe1680d67c99f24b32e3f274e2c647f923560088 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 08:49:53 +0000 Subject: [PATCH 27/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index fe8aba7..5de8d93 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.6 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 1.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cc67e1d5c8f3a0baedc743ebd47f98841db983b7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:22 +0000 Subject: [PATCH 28/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2836fac..d1a0e1d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libupnp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0ac6dbda72cbe296cb14213986a1e6086fdf38ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:48:27 +0000 Subject: [PATCH 29/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d1a0e1d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libupnp -# $Id$ -NAME := libupnp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 58a0656dbfbec9dd3f4244db0eb2099abdcb2087 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 06:32:48 -0600 Subject: [PATCH 30/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 5de8d93..3937577 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.6 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.6.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jul 25 2009 Fedora Release Engineering - 1.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 1502ff2ca1813928a6916161a463efe739110efc Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 31 May 2011 11:27:30 -0400 Subject: [PATCH 31/63] libupnp-1.6.13-1.fc16 --- .gitignore | 1 + libupnp.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3f96adb..11094cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libupnp-1.6.6.tar.bz2 +/libupnp-1.6.13.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 3937577..088d7d9 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,12 +1,11 @@ -Version: 1.6.6 +Version: 1.6.13 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} @@ -75,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue May 31 2011 Adam Jackson 1.6.13-1 +- libupnp 1.6.13 + * Tue Feb 08 2011 Fedora Release Engineering - 1.6.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index bc0ba35..33171c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8918dcf7428cd119d0c8275765ff2833 libupnp-1.6.6.tar.bz2 +71476b1781ad179bfc9bead640be5f54 libupnp-1.6.13.tar.bz2 From 2bb4c4adea7fa569f86399d7fabb59da38d480e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Sat, 30 Jul 2011 22:56:07 +0200 Subject: [PATCH 32/63] Rebuild against new libraries. --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 088d7d9..9911d94 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.13 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sat Jul 30 2011 Matěj Cepl - 1.6.13-2 +- Rebuilt against new libraries. + * Tue May 31 2011 Adam Jackson 1.6.13-1 - libupnp 1.6.13 From 952d925336df054ea371f2c67a909cff7136c56b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:35:26 -0600 Subject: [PATCH 33/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 9911d94..c835c80 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.13 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.6.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Jul 30 2011 Matěj Cepl - 1.6.13-2 - Rebuilt against new libraries. From 4e7a0084526d2a4ec351d52f45f2b7575051f5ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 16:29:35 -0500 Subject: [PATCH 34/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index c835c80..57505f0 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.13 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.6.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.6.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 791200923a77479f25b9db9448e40c0236427abf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 16 Oct 2012 17:20:09 -0400 Subject: [PATCH 35/63] libupnp 1.6.17 --- .gitignore | 1 + libupnp.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 11094cb..1aa230f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libupnp-1.6.6.tar.bz2 /libupnp-1.6.13.tar.bz2 +/libupnp-1.6.17.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 57505f0..2a9add6 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,11 +1,11 @@ -Version: 1.6.13 +Version: 1.6.17 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ -Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} @@ -57,9 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{docdir} -%{_libdir}/libixml.so.* -%{_libdir}/libthreadutil.so.* -%{_libdir}/libupnp.so.* +%{_libdir}/libixml.so.2* +%{_libdir}/libthreadutil.so.6* +%{_libdir}/libupnp.so.6* %files devel %defattr(0644,root,root,0755) @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue Oct 16 2012 Adam Jackson 1.6.17-1 +- libupnp 1.6.17 + * Thu Jul 19 2012 Fedora Release Engineering - 1.6.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 33171c2..88cd5c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71476b1781ad179bfc9bead640be5f54 libupnp-1.6.13.tar.bz2 +efbf0d470ce7157bc0e6ca836e246de5 libupnp-1.6.17.tar.bz2 From fbf281dd3441a8968fb63eb9fbd0b19f8a6a2462 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 29 Jan 2013 13:40:46 -0500 Subject: [PATCH 36/63] libupnp 1.6.18 (#905577) --- .gitignore | 1 + libupnp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1aa230f..820821e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libupnp-1.6.6.tar.bz2 /libupnp-1.6.13.tar.bz2 /libupnp-1.6.17.tar.bz2 +/libupnp-1.6.18.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 2a9add6..e873248 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.17 +Version: 1.6.18 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue Jan 29 2013 Adam Jackson 1.6.18-1 +- libupnp 1.6.18 (#905577) + * Tue Oct 16 2012 Adam Jackson 1.6.17-1 - libupnp 1.6.17 diff --git a/sources b/sources index 88cd5c5..110d346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efbf0d470ce7157bc0e6ca836e246de5 libupnp-1.6.17.tar.bz2 +11c6484fd2e2927bf3b8d8108407ca56 libupnp-1.6.18.tar.bz2 From 68ef8a6779f60820d6b1f12af638d8e1988532fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 23:25:17 -0600 Subject: [PATCH 37/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 2a9add6..19a7891 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.17 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Oct 16 2012 Adam Jackson 1.6.17-1 - libupnp 1.6.17 From b9bd9060d73786436faca1ba865ee4a8ae6f6caa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:21:11 -0500 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index bda2c74..2e596af 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.18 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jan 29 2013 Adam Jackson 1.6.18-1 - libupnp 1.6.18 (#905577) From 24f374390db20c7c30e5dd78c187750350dd81bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Oct 2013 13:43:04 +0200 Subject: [PATCH 39/63] Adapt to possibly unversioned doc dirs. - Include LICENSE and THANKS in main package. --- libupnp.spec | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index 2e596af..1b2838e 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.18 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -35,18 +35,9 @@ make %{?_smp_mflags} test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#create the doc devel dir -%{__mkdir_p} %{buildroot}%{docdeveldir} - -#mv examples dir and pdf file to the doc devel dir -%{__mv} %{buildroot}%{docdir}/examples \ - %{buildroot}%{docdeveldir}/ -%{__mv} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf \ - %{buildroot}%{docdeveldir}/ -%{__mv} %{buildroot}%{docdir}/IXML_Programming_Guide.pdf \ - %{buildroot}%{docdeveldir}/ -%{__mv} %{buildroot}%{docdir}/html \ - %{buildroot}%{docdeveldir}/ +#the installed docs are all devel, setup them for pickup in %%files +%{__mkdir} _devel_docs +%{__mv} %{buildroot}%{docdir}/* _devel_docs %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} @@ -56,14 +47,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc %{docdir} +%doc LICENSE THANKS %{_libdir}/libixml.so.2* %{_libdir}/libthreadutil.so.6* %{_libdir}/libupnp.so.6* %files devel %defattr(0644,root,root,0755) -%doc %{docdeveldir} +%doc _devel_docs/* %{_includedir}/upnp/ %{_libdir}/libixml.so %{_libdir}/libthreadutil.so @@ -74,6 +65,10 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Oct 27 2013 Ville Skyttä - 1.6.18-4 +- Adapt to possibly unversioned doc dirs. +- Include LICENSE and THANKS in main package. + * Sat Aug 03 2013 Fedora Release Engineering - 1.6.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d6cc41f8ef3e045d244ac21a80d540eed5e50332 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 9 Dec 2013 11:55:54 -0500 Subject: [PATCH 40/63] libupnp 1.6.19 - Build with --enable-ipv6 (#917210) --- .gitignore | 1 + libupnp.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 820821e..4aa48d2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libupnp-1.6.6.tar.bz2 /libupnp-1.6.13.tar.bz2 /libupnp-1.6.17.tar.bz2 /libupnp-1.6.18.tar.bz2 +/libupnp-1.6.19.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 1b2838e..aa3b417 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ -Version: 1.6.18 +Version: 1.6.19 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -28,17 +28,13 @@ the UPnP SDK libraries. %setup -q %build -%configure --with-documentation --enable-static=no +%configure --enable-static=no --enable-ipv6 make %{?_smp_mflags} %install test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#the installed docs are all devel, setup them for pickup in %%files -%{__mkdir} _devel_docs -%{__mv} %{buildroot}%{docdir}/* _devel_docs - %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig @@ -54,7 +50,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %files devel %defattr(0644,root,root,0755) -%doc _devel_docs/* +#doc _devel_docs/* %{_includedir}/upnp/ %{_libdir}/libixml.so %{_libdir}/libthreadutil.so @@ -65,6 +61,10 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Mon Dec 09 2013 Adam Jackson 1.6.19-1 +- libupnp 1.6.19 +- Build with --enable-ipv6 (#917210) + * Sun Oct 27 2013 Ville Skyttä - 1.6.18-4 - Adapt to possibly unversioned doc dirs. - Include LICENSE and THANKS in main package. diff --git a/sources b/sources index 110d346..bd27534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11c6484fd2e2927bf3b8d8108407ca56 libupnp-1.6.18.tar.bz2 +ee16e5d33a3ea7506f38d71facc057dd libupnp-1.6.19.tar.bz2 From 90cf2182c47243cd395ad0bbdbe55f85f8b39990 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:50:25 -0500 Subject: [PATCH 41/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index aa3b417..6bbbc71 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.19 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Dec 09 2013 Adam Jackson 1.6.19-1 - libupnp 1.6.19 - Build with --enable-ipv6 (#917210) From ebc7721d12ad5491106d069cd14a4f80c8cc8cb4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 06:32:11 +0000 Subject: [PATCH 42/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 6bbbc71..f221c49 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.19 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.6.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.6.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e37b23bca0709634cbdf4b328d29c49442c3d9f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 17:30:12 +0000 Subject: [PATCH 43/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index f221c49..94b3e10 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.19 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 1.6.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From adc99b1fcca485ff3ef4c1dc80f4a51c4f3eb11e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:04:51 +0000 Subject: [PATCH 44/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 94b3e10..9012dc4 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.19 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.6.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.6.19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From db6238759683239ea53696128ebbd417ce207497 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 18 Jul 2016 14:07:00 -0400 Subject: [PATCH 45/63] libupnp 1.6.20 - Don't write to the filesystem on unhandled POST requests --- .gitignore | 1 + ...ndled-POSTs-to-write-to-the-filesyst.patch | 24 +++++++++++++++++++ libupnp.spec | 11 +++++++-- sources | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch diff --git a/.gitignore b/.gitignore index 4aa48d2..7b95908 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libupnp-1.6.6.tar.bz2 /libupnp-1.6.17.tar.bz2 /libupnp-1.6.18.tar.bz2 /libupnp-1.6.19.tar.bz2 +/libupnp-1.6.20.tar.bz2 diff --git a/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch b/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch new file mode 100644 index 0000000..d59c688 --- /dev/null +++ b/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch @@ -0,0 +1,24 @@ +Originally: + +https://github.com/mjg59/pupnp-code/commit/be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd + +But without the configure bits, because we're just going to leave it disabled +anyway, and I don't feel like making autoreconf work. + +diff -up libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c.jx libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c +--- libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c.jx 2016-07-07 13:05:30.000000000 -0400 ++++ libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c 2016-07-18 14:02:23.920747068 -0400 +@@ -1367,9 +1367,13 @@ static int http_RecvPostMessage( + if (Fp == NULL) + return HTTP_INTERNAL_SERVER_ERROR; + } else { ++#ifdef UPNP_ENABLE_POST_WRITE + Fp = fopen(filename, "wb"); + if (Fp == NULL) + return HTTP_UNAUTHORIZED; ++#else ++ return HTTP_NOT_FOUND; ++#endif + } + parser->position = POS_ENTITY; + do { diff --git a/libupnp.spec b/libupnp.spec index 9012dc4..3b1d893 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ -Version: 1.6.19 +Version: 1.6.20 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 5%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -10,6 +10,8 @@ Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} +Patch0: 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch + %description The Universal Plug and Play (UPnP) SDK for Linux provides support for building UPnP-compliant control points, devices, @@ -26,6 +28,7 @@ the UPnP SDK libraries. %prep %setup -q +%patch0 -p1 %build %configure --enable-static=no --enable-ipv6 @@ -61,6 +64,10 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Mon Jul 18 2016 Adam Jackson - 1.6.20-1 +- libupnp 1.6.20 +- Don't write to the filesystem on unhandled POST requests + * Thu Feb 04 2016 Fedora Release Engineering - 1.6.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index bd27534..b54a200 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee16e5d33a3ea7506f38d71facc057dd libupnp-1.6.19.tar.bz2 +6839c376b5ec71d2d56f7b64e829c438 libupnp-1.6.20.tar.bz2 From fa66da999f98955ad5b9ab2891d77c06191f376d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:37:38 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 3b1d893..c275982 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.20 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -64,6 +64,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.6.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jul 18 2016 Adam Jackson - 1.6.20-1 - libupnp 1.6.20 - Don't write to the filesystem on unhandled POST requests From 8c6857fc403b3cfb142ad291e5b35486fe37b66c Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 7 Mar 2017 13:12:54 -0600 Subject: [PATCH 47/63] Update to 1.6.21, remove patch committed upstream --- .gitignore | 7 +----- ...ndled-POSTs-to-write-to-the-filesyst.patch | 24 ------------------- libupnp.spec | 10 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch diff --git a/.gitignore b/.gitignore index 7b95908..9e7c4ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -libupnp-1.6.6.tar.bz2 -/libupnp-1.6.13.tar.bz2 -/libupnp-1.6.17.tar.bz2 -/libupnp-1.6.18.tar.bz2 -/libupnp-1.6.19.tar.bz2 -/libupnp-1.6.20.tar.bz2 +/libupnp-1.6.21.tar.bz2 diff --git a/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch b/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch deleted file mode 100644 index d59c688..0000000 --- a/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch +++ /dev/null @@ -1,24 +0,0 @@ -Originally: - -https://github.com/mjg59/pupnp-code/commit/be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd - -But without the configure bits, because we're just going to leave it disabled -anyway, and I don't feel like making autoreconf work. - -diff -up libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c.jx libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c ---- libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c.jx 2016-07-07 13:05:30.000000000 -0400 -+++ libupnp-1.6.20/upnp/src/genlib/net/http/webserver.c 2016-07-18 14:02:23.920747068 -0400 -@@ -1367,9 +1367,13 @@ static int http_RecvPostMessage( - if (Fp == NULL) - return HTTP_INTERNAL_SERVER_ERROR; - } else { -+#ifdef UPNP_ENABLE_POST_WRITE - Fp = fopen(filename, "wb"); - if (Fp == NULL) - return HTTP_UNAUTHORIZED; -+#else -+ return HTTP_NOT_FOUND; -+#endif - } - parser->position = POS_ENTITY; - do { diff --git a/libupnp.spec b/libupnp.spec index c275982..21ebd51 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ -Version: 1.6.20 +Version: 1.6.21 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -10,8 +10,6 @@ Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 %define docdeveldir %{_docdir}/%{name}-devel-%{version} %define docdir %{_docdir}/%{name}-%{version} -Patch0: 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch - %description The Universal Plug and Play (UPnP) SDK for Linux provides support for building UPnP-compliant control points, devices, @@ -28,7 +26,6 @@ the UPnP SDK libraries. %prep %setup -q -%patch0 -p1 %build %configure --enable-static=no --enable-ipv6 @@ -64,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Tue Mar 07 2017 Michael Cronenworth - 1.6.21-1 +- libupnp 1.6.21 + * Fri Feb 10 2017 Fedora Release Engineering - 1.6.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index b54a200..1debd07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6839c376b5ec71d2d56f7b64e829c438 libupnp-1.6.20.tar.bz2 +SHA512 (libupnp-1.6.21.tar.bz2) = 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb From 8fa4a59abbb6da2b2e71daae47f5f249774fb523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:54:25 +0000 Subject: [PATCH 48/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 21ebd51..9391a13 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.21 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.6.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Mar 07 2017 Michael Cronenworth - 1.6.21-1 - libupnp 1.6.21 From 187ce3f26ab430dbab5e3b84de3828495607bb65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:26:51 +0000 Subject: [PATCH 49/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 9391a13..7ee540f 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.21 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.6.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 522602a0b44f48029437e9e53b03a91c8b34fc3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:35:51 +0000 Subject: [PATCH 50/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 7ee540f..ee1082e 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.6.21 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf %{buildroot} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.6.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.6.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 3aa10f2fedbe65304388f9987bb7da185e62a5b8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:19:35 +0100 Subject: [PATCH 51/63] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libupnp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index ee1082e..4f277b2 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -57,9 +57,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/libupnp.so %{_libdir}/pkgconfig/libupnp.pc -%clean -rm -rf %{buildroot} - %changelog * Wed Feb 07 2018 Fedora Release Engineering - 1.6.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d7243a2bed20cca7c57f941c6dd7f57a254268d3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 13 Apr 2018 08:26:08 +0200 Subject: [PATCH 52/63] Update to current bugfix --- .gitignore | 2 +- libupnp.spec | 39 ++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 9e7c4ad..91dda42 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libupnp-1.6.21.tar.bz2 +libupnp-*.tar.bz2 diff --git a/libupnp.spec b/libupnp.spec index 4f277b2..3242eba 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,14 +1,11 @@ -Version: 1.6.21 +Version: 1.6.25 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD -Group: System Environment/Libraries -URL: http://www.libupnp.org/ -Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 +URL: https://sourceforge.net/projects/pupnp +Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 -%define docdeveldir %{_docdir}/%{name}-devel-%{version} -%define docdir %{_docdir}/%{name}-%{version} %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -16,9 +13,8 @@ support for building UPnP-compliant control points, devices, and bridges on Linux. %package devel -Group: Development/Libraries Summary: Include files needed for development with libupnp -Requires: libupnp = %{version}-%{release} +Requires: libupnp%{?_isa} = %{version}-%{release} %description devel The libupnp-devel package contains the files necessary for development with @@ -29,28 +25,28 @@ the UPnP SDK libraries. %build %configure --enable-static=no --enable-ipv6 -make %{?_smp_mflags} + +# remove rpath from libtool +sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +%make_build %install -test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root,-) -%doc LICENSE THANKS +%license LICENSE +%doc THANKS %{_libdir}/libixml.so.2* %{_libdir}/libthreadutil.so.6* %{_libdir}/libupnp.so.6* %files devel -%defattr(0644,root,root,0755) -#doc _devel_docs/* %{_includedir}/upnp/ %{_libdir}/libixml.so %{_libdir}/libthreadutil.so @@ -58,6 +54,11 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/pkgconfig/libupnp.pc %changelog +* Fri Apr 13 2018 Nicolas Chauvet - 1.6.25-1 +- Update to 1.6.25 +- Spec file clean-up +- Avoid rpath + * Wed Feb 07 2018 Fedora Release Engineering - 1.6.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 1debd07..56a85e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libupnp-1.6.21.tar.bz2) = 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb +SHA512 (libupnp-1.6.25.tar.bz2) = c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f From 2557bfe1d041d24b1419681aebbf342c68628972 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 13 Apr 2018 10:31:51 +0200 Subject: [PATCH 53/63] Update to 1.8.3 --- libupnp.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index 3242eba..0b068f9 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,4 +1,4 @@ -Version: 1.6.25 +Version: 1.8.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} @@ -24,7 +24,12 @@ the UPnP SDK libraries. %setup -q %build -%configure --enable-static=no --enable-ipv6 +%configure \ +%if 0%{?__isa_bits} == 32 + --disable-largefile \ +%endif + --enable-static=no \ + --enable-ipv6 # remove rpath from libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -35,25 +40,27 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %install %make_install -%{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} +%{__rm} %{buildroot}%{_libdir}/{libixml.la,libupnp.la} %ldconfig_scriptlets %files %license LICENSE %doc THANKS -%{_libdir}/libixml.so.2* -%{_libdir}/libthreadutil.so.6* -%{_libdir}/libupnp.so.6* +%{_libdir}/libixml.so.10* +%{_libdir}/libupnp.so.10* %files devel %{_includedir}/upnp/ %{_libdir}/libixml.so -%{_libdir}/libthreadutil.so %{_libdir}/libupnp.so %{_libdir}/pkgconfig/libupnp.pc %changelog +* Fri Apr 13 2018 Nicolas Chauvet - 1.8.3-1 +- Update to 1.8.3 +- Drop libthreadutil + * Fri Apr 13 2018 Nicolas Chauvet - 1.6.25-1 - Update to 1.6.25 - Spec file clean-up From 51d653aebcc7e86c6a23a66ba3670ecbe6699b79 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 13 Apr 2018 12:23:00 +0200 Subject: [PATCH 54/63] source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 56a85e4..a2d118b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libupnp-1.6.25.tar.bz2) = c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f +SHA512 (libupnp-1.8.3.tar.bz2) = fa41efa11ad784e9c0040cecb17e91fbb4106509a9c84c6838b5bb636bfc96710683417fba6f4f4aec3f068fccbfe4f3a8218eca80bbca9e5604865ec72e5d66 From bd7c1a3899cc910e82b6244dcb17b1bd058eff08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:59:16 +0000 Subject: [PATCH 55/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 0b068f9..797f5ba 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.8.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 @@ -57,6 +57,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Apr 13 2018 Nicolas Chauvet - 1.8.3-1 - Update to 1.8.3 - Drop libthreadutil From a92ab7303133fb0885dfda8113ba914ac4a89864 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 20 Jul 2018 10:41:32 +0200 Subject: [PATCH 56/63] Add missing cc --- libupnp.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 797f5ba..18a2b55 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,11 +1,13 @@ Version: 1.8.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 +BuildRequires: gcc + %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -57,6 +59,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Fri Jul 20 2018 Nicolas Chauvet - 1.8.3-3 +- Add missng cc + * Fri Jul 13 2018 Fedora Release Engineering - 1.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 853f61e28fff40047ee1273623c3aa10743376d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 13 Dec 2018 17:49:47 -0600 Subject: [PATCH 57/63] pull in patch from upstream so that samples will build on 32 bit arches with largefile support, enables gerbera to run on armv7hl and i686 Signed-off-by: Dennis Gilmore --- libupnp.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libupnp.spec b/libupnp.spec index 18a2b55..025f8b6 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,12 +1,13 @@ Version: 1.8.3 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 +Patch0: 96.patch -BuildRequires: gcc +BuildRequires: gcc autoconf automake %description @@ -24,12 +25,11 @@ the UPnP SDK libraries. %prep %setup -q +%patch0 -p1 +autoreconf %build %configure \ -%if 0%{?__isa_bits} == 32 - --disable-largefile \ -%endif --enable-static=no \ --enable-ipv6 @@ -59,6 +59,10 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Thu Dec 13 2018 Dennis Gilmore - 1.8.3-4 +- pull in patch from upstream so that samples will build on 32 bit arches with +- largefile support, enables gerbera to run on armv7hl and i686 + * Fri Jul 20 2018 Nicolas Chauvet - 1.8.3-3 - Add missng cc From ff88844c5146355d58ec0f1c44bcf3b914e13370 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 13 Dec 2018 17:50:04 -0600 Subject: [PATCH 58/63] pull in patch from upstream so that samples will build on 32 bit arches with largefile support, enables gerbera to run on armv7hl and i686 Signed-off-by: Dennis Gilmore --- 96.patch | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 96.patch diff --git a/96.patch b/96.patch new file mode 100644 index 0000000..e8e358e --- /dev/null +++ b/96.patch @@ -0,0 +1,68 @@ +From c17d66e5dce011acef34435598eddf7122458b33 Mon Sep 17 00:00:00 2001 +From: Jean-Francois Dockes +Date: Thu, 13 Dec 2018 18:39:43 +0100 +Subject: [PATCH] Ensure that the samples use the same largefile options as the + library + +Create a configuration file specific to the samples, to mimick what a +regular application would have to do. +--- + .gitignore | 2 ++ + configure.ac | 2 +- + upnp/sample/common/config_sample.h.in | 21 +++++++++++++++++++++ + upnp/sample/common/sample_util.h | 1 + + 4 files changed, 25 insertions(+), 1 deletion(-) + create mode 100644 upnp/sample/common/config_sample.h.in + +diff --git a/configure.ac b/configure.ac +index 108ad7bf..670d3632 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,7 +432,7 @@ AC_CANONICAL_HOST + # libraries : it contains information on the configuration of the + # installed libraries. + # +-AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) ++AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h upnp/sample/common/config_sample.h]) + AX_SYS_LARGEFILE_SENSITIVE + + if test "x$ac_cv_sys_largefile_sensitive" = "xyes"; then +diff --git a/upnp/sample/common/config_sample.h.in b/upnp/sample/common/config_sample.h.in +new file mode 100644 +index 00000000..8fbc38e3 +--- /dev/null ++++ b/upnp/sample/common/config_sample.h.in +@@ -0,0 +1,21 @@ ++/* ++ * On systems where the size of off_t depends on compile flags, libupnp needs ++ * the programs which use it to be built with the same options as itself. ++ * This is checked at compile time, but the actual variables (such as ++ * _FILE_OFFSET_BITS) are not exported by the library (to avoid surprises in ++ * applications). ++ * A "normal" application would need to explicitely configure large file ++ * support depending on how libupnp was built, using its own configure ++ * routines. For the samples, we equivalently let the main libupnp configure ++ * create this file. ++ */ ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++#undef _LARGEFILE_SOURCE ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ +diff --git a/upnp/sample/common/sample_util.h b/upnp/sample/common/sample_util.h +index 2bca04ff..6d853efb 100644 +--- a/upnp/sample/common/sample_util.h ++++ b/upnp/sample/common/sample_util.h +@@ -44,6 +44,7 @@ + extern "C" { + #endif /* __cplusplus */ + ++#include "config_sample.h" + #include "ithread.h" + #include "ixml.h" /* for IXML_Document, IXML_Element */ + #include "upnp.h" /* for Upnp_EventType */ From 306f80e6ca3f5d65f4db92257657244f0155044e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 8 Jan 2019 15:11:19 +0100 Subject: [PATCH 59/63] Update to 1.8.4 --- 96.patch | 68 ---------------------------------------------------- libupnp.spec | 12 ++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 73 deletions(-) delete mode 100644 96.patch diff --git a/96.patch b/96.patch deleted file mode 100644 index e8e358e..0000000 --- a/96.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c17d66e5dce011acef34435598eddf7122458b33 Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Thu, 13 Dec 2018 18:39:43 +0100 -Subject: [PATCH] Ensure that the samples use the same largefile options as the - library - -Create a configuration file specific to the samples, to mimick what a -regular application would have to do. ---- - .gitignore | 2 ++ - configure.ac | 2 +- - upnp/sample/common/config_sample.h.in | 21 +++++++++++++++++++++ - upnp/sample/common/sample_util.h | 1 + - 4 files changed, 25 insertions(+), 1 deletion(-) - create mode 100644 upnp/sample/common/config_sample.h.in - -diff --git a/configure.ac b/configure.ac -index 108ad7bf..670d3632 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -432,7 +432,7 @@ AC_CANONICAL_HOST - # libraries : it contains information on the configuration of the - # installed libraries. - # --AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) -+AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h upnp/sample/common/config_sample.h]) - AX_SYS_LARGEFILE_SENSITIVE - - if test "x$ac_cv_sys_largefile_sensitive" = "xyes"; then -diff --git a/upnp/sample/common/config_sample.h.in b/upnp/sample/common/config_sample.h.in -new file mode 100644 -index 00000000..8fbc38e3 ---- /dev/null -+++ b/upnp/sample/common/config_sample.h.in -@@ -0,0 +1,21 @@ -+/* -+ * On systems where the size of off_t depends on compile flags, libupnp needs -+ * the programs which use it to be built with the same options as itself. -+ * This is checked at compile time, but the actual variables (such as -+ * _FILE_OFFSET_BITS) are not exported by the library (to avoid surprises in -+ * applications). -+ * A "normal" application would need to explicitely configure large file -+ * support depending on how libupnp was built, using its own configure -+ * routines. For the samples, we equivalently let the main libupnp configure -+ * create this file. -+ */ -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -diff --git a/upnp/sample/common/sample_util.h b/upnp/sample/common/sample_util.h -index 2bca04ff..6d853efb 100644 ---- a/upnp/sample/common/sample_util.h -+++ b/upnp/sample/common/sample_util.h -@@ -44,6 +44,7 @@ - extern "C" { - #endif /* __cplusplus */ - -+#include "config_sample.h" - #include "ithread.h" - #include "ixml.h" /* for IXML_Document, IXML_Element */ - #include "upnp.h" /* for Upnp_EventType */ diff --git a/libupnp.spec b/libupnp.spec index 025f8b6..2865fc1 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,11 +1,11 @@ -Version: 1.8.3 +Version: 1.8.4 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 -Patch0: 96.patch +Patch0: libupnp-1.8.4-nobump.patch BuildRequires: gcc autoconf automake @@ -47,7 +47,7 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %ldconfig_scriptlets %files -%license LICENSE +%license COPYING %doc THANKS %{_libdir}/libixml.so.10* %{_libdir}/libupnp.so.10* @@ -59,6 +59,10 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Tue Jan 08 2019 Nicolas Chauvet - 1.8.4-1 +- Update to 1.8.4 +- Revert the ABI bump since it's the same as 1.8.3 + * Thu Dec 13 2018 Dennis Gilmore - 1.8.3-4 - pull in patch from upstream so that samples will build on 32 bit arches with - largefile support, enables gerbera to run on armv7hl and i686 diff --git a/sources b/sources index a2d118b..b545e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libupnp-1.8.3.tar.bz2) = fa41efa11ad784e9c0040cecb17e91fbb4106509a9c84c6838b5bb636bfc96710683417fba6f4f4aec3f068fccbfe4f3a8218eca80bbca9e5604865ec72e5d66 +SHA512 (libupnp-1.8.4.tar.bz2) = 403d7b6408a33330fc59fbe6284cc7bca10a675c41b323bba6b9c6461c8a82fbb39f4a1a07d1a3b55f049c637830ebf21bd825cd6c2f4eb17265018ccee9cbb6 From 350bd9c3825354d1d85c4dc82989d5b67c301937 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 8 Jan 2019 15:45:04 +0100 Subject: [PATCH 60/63] Add patch --- libupnp-1.8.4-nobump.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 libupnp-1.8.4-nobump.patch diff --git a/libupnp-1.8.4-nobump.patch b/libupnp-1.8.4-nobump.patch new file mode 100644 index 0000000..cc905d2 --- /dev/null +++ b/libupnp-1.8.4-nobump.patch @@ -0,0 +1,12 @@ +diff -up libupnp-1.8.4/configure.ac.nobump libupnp-1.8.4/configure.ac +--- libupnp-1.8.4/configure.ac.nobump 2018-10-25 16:54:52.000000000 +0200 ++++ libupnp-1.8.4/configure.ac 2019-01-08 15:17:39.420358079 +0100 +@@ -388,7 +388,7 @@ dnl #AC_SUBST([LT_VERSION_UPNP], [ + dnl # + dnl ############################################################################ + AC_SUBST([LT_VERSION_IXML], [10:1:0]) +-AC_SUBST([LT_VERSION_UPNP], [13:0:0]) ++AC_SUBST([LT_VERSION_UPNP], [12:0:2]) + dnl ############################################################################ + dnl # Repeating the algorithm to place it closer to the modificatin place: + dnl # - library code modified: revision++ From f5b115e81cec617aaabb7a5908d41a406887aaa0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 8 Jan 2019 15:53:36 +0100 Subject: [PATCH 61/63] Add back 96.patch --- 96.patch | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libupnp.spec | 2 ++ 2 files changed, 70 insertions(+) create mode 100644 96.patch diff --git a/96.patch b/96.patch new file mode 100644 index 0000000..e8e358e --- /dev/null +++ b/96.patch @@ -0,0 +1,68 @@ +From c17d66e5dce011acef34435598eddf7122458b33 Mon Sep 17 00:00:00 2001 +From: Jean-Francois Dockes +Date: Thu, 13 Dec 2018 18:39:43 +0100 +Subject: [PATCH] Ensure that the samples use the same largefile options as the + library + +Create a configuration file specific to the samples, to mimick what a +regular application would have to do. +--- + .gitignore | 2 ++ + configure.ac | 2 +- + upnp/sample/common/config_sample.h.in | 21 +++++++++++++++++++++ + upnp/sample/common/sample_util.h | 1 + + 4 files changed, 25 insertions(+), 1 deletion(-) + create mode 100644 upnp/sample/common/config_sample.h.in + +diff --git a/configure.ac b/configure.ac +index 108ad7bf..670d3632 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,7 +432,7 @@ AC_CANONICAL_HOST + # libraries : it contains information on the configuration of the + # installed libraries. + # +-AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) ++AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h upnp/sample/common/config_sample.h]) + AX_SYS_LARGEFILE_SENSITIVE + + if test "x$ac_cv_sys_largefile_sensitive" = "xyes"; then +diff --git a/upnp/sample/common/config_sample.h.in b/upnp/sample/common/config_sample.h.in +new file mode 100644 +index 00000000..8fbc38e3 +--- /dev/null ++++ b/upnp/sample/common/config_sample.h.in +@@ -0,0 +1,21 @@ ++/* ++ * On systems where the size of off_t depends on compile flags, libupnp needs ++ * the programs which use it to be built with the same options as itself. ++ * This is checked at compile time, but the actual variables (such as ++ * _FILE_OFFSET_BITS) are not exported by the library (to avoid surprises in ++ * applications). ++ * A "normal" application would need to explicitely configure large file ++ * support depending on how libupnp was built, using its own configure ++ * routines. For the samples, we equivalently let the main libupnp configure ++ * create this file. ++ */ ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++#undef _LARGEFILE_SOURCE ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ +diff --git a/upnp/sample/common/sample_util.h b/upnp/sample/common/sample_util.h +index 2bca04ff..6d853efb 100644 +--- a/upnp/sample/common/sample_util.h ++++ b/upnp/sample/common/sample_util.h +@@ -44,6 +44,7 @@ + extern "C" { + #endif /* __cplusplus */ + ++#include "config_sample.h" + #include "ithread.h" + #include "ixml.h" /* for IXML_Document, IXML_Element */ + #include "upnp.h" /* for Upnp_EventType */ diff --git a/libupnp.spec b/libupnp.spec index 2865fc1..a5c2c1f 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -6,6 +6,7 @@ License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 Patch0: libupnp-1.8.4-nobump.patch +Patch1: 96.patch BuildRequires: gcc autoconf automake @@ -62,6 +63,7 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool * Tue Jan 08 2019 Nicolas Chauvet - 1.8.4-1 - Update to 1.8.4 - Revert the ABI bump since it's the same as 1.8.3 +- Add back patch for largefile support * Thu Dec 13 2018 Dennis Gilmore - 1.8.3-4 - pull in patch from upstream so that samples will build on 32 bit arches with From 7e1c211c3428a291d4d761b203f713817b87b88b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 8 Jan 2019 16:00:29 +0100 Subject: [PATCH 62/63] Apply 96.patch --- libupnp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libupnp.spec b/libupnp.spec index a5c2c1f..2075256 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -27,6 +27,7 @@ the UPnP SDK libraries. %prep %setup -q %patch0 -p1 +%patch1 -p1 autoreconf %build From fe9e6ce6825060d9bd6f75373e5e0693de4da420 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:27:09 +0000 Subject: [PATCH 63/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libupnp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libupnp.spec b/libupnp.spec index 2075256..5c1f672 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,7 +1,7 @@ Version: 1.8.4 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 @@ -61,6 +61,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 08 2019 Nicolas Chauvet - 1.8.4-1 - Update to 1.8.4 - Revert the ABI bump since it's the same as 1.8.3