Added deb-target to Makefile.am to build Debian packages. Fixed copyr…

…ight notices in source files to match the copyright defined in COPYING. Added NULL check to cg_strtrimwhite(). Added NULL checks and fixed memory leaks in cg_net_selectaddr() and cg_net_gethostinterfaces(). Disabled "Expect" HTTP header because it causes IOP issues with some UPnP implementations. Added NULL check to cg_xml_node_getchildnode() macro. Fixed Debian specific files and added debug package building git-svn-id: https://svn.code.sf.net/p/clinkc/code/trunk@249 bfd3be0d-9f21-0410-925f-e30e9767a5cc
cybergarage · Oct 22, 2007 · dc547ad · dc547ad
1 parent b224e42
commit dc547ad
Show file tree

Hide file tree

Showing 132 changed files with 190 additions and 157 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-22  Aapo Makela <[email protected]>
+	* Added deb-target to Makefile.am to build Debian packages
+	* Fixed copyright notices in source files to match the copyright defined in COPYING
+	* Added NULL check to cg_strtrimwhite()
+	* Added NULL checks and fixed memory leaks in cg_net_selectaddr() and cg_net_gethostinterfaces()
+	* Disabled "Expect" HTTP header because it causes IOP issues with some UPnP implementations.
+	* Added NULL check to cg_xml_node_getchildnode() macro
+	* Fixed Debian specific files and added debug package building
+
 2007-10-02  Satoshi Konno <[email protected]>
 	* Changed cg_thread_() to return FALSE when the specified object is null.
 	* Added cg_http_server_lock() and cg_http_server_unlock().

diff --git a/Makefile.am b/Makefile.am
@@ -7,14 +7,12 @@ docsdir = $(datadir)/doc/clinkc0
 EXTRA_DIST = debian/changelog \
 	debian/clinkc0.install \
 	debian/clinkc-dev.install \
-	debian/clinkc-tests.install \
-	debian/clinkcmaemo0.install \
-	debian/clinkcmaemo-tests.install \
 	debian/compat \
 	debian/control \
 	debian/copyright \
 	debian/rules \
-	debian/docs
+	debian/docs \
+	include/cybergarage/upnp/cupnp.h.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = clinkc.pc
@@ -32,3 +30,10 @@ nobase_devdocs_DATA = \
 
 doxygen/html/*:
 	cd $(srcdir) && doxygen Doxyfile
+
+deb: dist
+	-mkdir $(top_builddir)/debian-build
+	-cp $(top_builddir)/../$(PACKAGE)*.orig.tar.gz $(top_builddir)/debian-build/
+	cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz
+	cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot -sa -D
+	-rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
diff --git a/configure.in b/configure.in
@@ -526,6 +526,4 @@ sample/clock/Makefile
 sample/clock/unix/Makefile
 sample/upnpdump/Makefile
 sample/upnpdump/unix/Makefile
-testunit/Makefile
-testunit/unix/Makefile
 ])
diff --git a/debian/clinkc-dev.install b/debian/clinkc-dev.install
@@ -1,7 +1,6 @@
 usr/include/*
 usr/include/cybergarage/*
 usr/lib/pkgconfig/*
-usr/lib/*.la
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/share/doc/clinkc-dev/*
diff --git a/debian/control b/debian/control
@@ -31,15 +31,15 @@ Description: CyberLink for C UPnP library
  This package contains the dynamically loadable library needed by 
  applications which use CyberLinkC for C.
 
-Package: clinkc-tests
+Package: clinkc0-dbg
 Section: libs
 Architecture: any
-Depends: clinkc0
-Description: Test applications for CyberLink for C UPnP library
+Depends: clinkc0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: CyberLink for C UPnP library
  CyberLink for C is a toolkit for creating UPnP devices and control points. 
  Main features are automatic discovery, search, expiration handling and 
  different controlling methods for UPnP control points and advertizing and 
  eventing for UPnP devices.
  .
- This package contains a set of programs that can be used to test CyberLink 
- for C UPnP library and other programs that are using it.
+ This package contains the debug symbols for the actual library.
+
diff --git a/debian/copyright b/debian/copyright
@@ -34,7 +34,4 @@ Subject to the below, redistribution and use in source and binary forms, with or
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-While Nokia Corporation licenses and/or distributes this ClinkC software and any files contained therein under its or third party copyrights, for clarification it is hereby stated that no patent license explicit or implied is granted by Nokia Corporation in connection to this license or distribution of this software. 
-
 In addition to the disclaimer above and not limiting its generality, no assurances are provided by Nokia Corporation that the software does not infringe patents of either third parties or Nokia Corporation in any particular jurisdiction. As a condition to exercising the rights and licenses granted hereunder in any particular jurisdiction, each recipient hereby assumes sole responsibility to procure licenses under any relevant patents in that jurisdiction. For example, if a third party patent license is required to allow recipient to distribute the program in a particular country, it is recipient's responsibility to acquire that license before distributing the program.
diff --git a/debian/rules b/debian/rules
@@ -36,8 +36,7 @@ major=`ls lib/unix/.libs/lib*.so.* | \
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-optimized-cp --enable-anyaddr 
-
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-optimized-cp --enable-anyaddr --enable-libxml2 --enable-libcurl
 
 build: build-stamp
 build-stamp:  config.status
@@ -52,7 +51,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
+	
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -61,7 +60,8 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
+	-rm -rf doxygen
+
 
 	dh_clean 
 
@@ -89,7 +89,7 @@ binary-arch: build install
 	dh_install -v --sourcedir=debian/tmp
 #	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=clinkc0
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs

diff --git a/include/cybergarage/http/chttp.h b/include/cybergarage/http/chttp.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: chttp.h

diff --git a/include/cybergarage/io/cfile.h b/include/cybergarage/io/cfile.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cfile.h

diff --git a/include/cybergarage/net/cinterface.h b/include/cybergarage/net/cinterface.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cinterface.h

diff --git a/include/cybergarage/net/csocket.h b/include/cybergarage/net/csocket.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: csocket.h

diff --git a/include/cybergarage/net/curi.h b/include/cybergarage/net/curi.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: curl.h

diff --git a/include/cybergarage/net/curl.h b/include/cybergarage/net/curl.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: curl.h

diff --git a/include/cybergarage/soap/csoap.h b/include/cybergarage/soap/csoap.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: csoap.h

diff --git a/include/cybergarage/upnp/caction.h b/include/cybergarage/upnp/caction.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: caction.h

diff --git a/include/cybergarage/upnp/cargument.h b/include/cybergarage/upnp/cargument.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cargument.h

diff --git a/include/cybergarage/upnp/ccontrolpoint.h b/include/cybergarage/upnp/ccontrolpoint.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: ccontrolpoint.h

diff --git a/include/cybergarage/upnp/cdevice.h b/include/cybergarage/upnp/cdevice.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cdevice.h

diff --git a/include/cybergarage/upnp/cicon.h b/include/cybergarage/upnp/cicon.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cicon.h

diff --git a/include/cybergarage/upnp/control/ccontrol.h b/include/cybergarage/upnp/control/ccontrol.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: ccontrol.h

diff --git a/include/cybergarage/upnp/cservice.h b/include/cybergarage/upnp/cservice.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cservice.h

diff --git a/include/cybergarage/upnp/cstatevariable.h b/include/cybergarage/upnp/cstatevariable.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cstatevariable.h

diff --git a/include/cybergarage/upnp/cupnp.h b/include/cybergarage/upnp/cupnp.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *       File: cupnp.h

diff --git a/include/cybergarage/upnp/cupnp.h.in b/include/cybergarage/upnp/cupnp.h.in
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *       File: cupnp.h

diff --git a/include/cybergarage/upnp/cupnp_function.h b/include/cybergarage/upnp/cupnp_function.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cupnp_function.h

diff --git a/include/cybergarage/upnp/cupnp_limit.h b/include/cybergarage/upnp/cupnp_limit.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cupnp_limit.h

diff --git a/include/cybergarage/upnp/cupnp_status.h b/include/cybergarage/upnp/cupnp_status.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: upnp_status.h

diff --git a/include/cybergarage/upnp/event/cevent.h b/include/cybergarage/upnp/event/cevent.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cevent.h

diff --git a/include/cybergarage/upnp/event/cnotify.h b/include/cybergarage/upnp/event/cnotify.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cevent.h

diff --git a/include/cybergarage/upnp/event/cproperty.h b/include/cybergarage/upnp/event/cproperty.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cproperty.h

diff --git a/include/cybergarage/upnp/event/csubscriber.h b/include/cybergarage/upnp/event/csubscriber.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: csubscriber.h

diff --git a/include/cybergarage/upnp/event/csubscription.h b/include/cybergarage/upnp/event/csubscription.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: csubscription.h

diff --git a/include/cybergarage/upnp/ssdp/cssdp.h b/include/cybergarage/upnp/ssdp/cssdp.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cssdp.h

diff --git a/include/cybergarage/upnp/ssdp/cssdp_server.h b/include/cybergarage/upnp/ssdp/cssdp_server.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: cssdp_server.h

diff --git a/include/cybergarage/util/ccond.h b/include/cybergarage/util/ccond.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: ccond.h

diff --git a/include/cybergarage/util/clist.h b/include/cybergarage/util/clist.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *	File: clist.h

diff --git a/include/cybergarage/util/clog.h b/include/cybergarage/util/clog.h
@@ -6,7 +6,7 @@
 *
 *       Copyright (C) 2006 Nokia Corporation. All rights reserved.
 *
-*       This is licensed under BSD-style license with patent exclusion,
+*       This is licensed under BSD-style license,
 *       see file COPYING.
 *
 *       File: clog.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,7 +34,4 @@ Subject to the below, redistribution and use in source and binary forms, with or

		THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


		While Nokia Corporation licenses and/or distributes this ClinkC software and any files contained therein under its or third party copyrights, for clarification it is hereby stated that no patent license explicit or implied is granted by Nokia Corporation in connection to this license or distribution of this software.

		In addition to the disclaimer above and not limiting its generality, no assurances are provided by Nokia Corporation that the software does not infringe patents of either third parties or Nokia Corporation in any particular jurisdiction. As a condition to exercising the rights and licenses granted hereunder in any particular jurisdiction, each recipient hereby assumes sole responsibility to procure licenses under any relevant patents in that jurisdiction. For example, if a third party patent license is required to allow recipient to distribute the program in a particular country, it is recipient's responsibility to acquire that license before distributing the program.