From 22d62275051ab60ec6bd275452331e5bf373facd Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 11 Nov 2009 21:42:05 +0000
Subject: [package] opkg: bump to r284 	- incorporates parsing improvements
 upstream 	- fixes a couple of memory leaks 	- fixes some null
 pointer dereferences 	- fixes possible crashes during removal of packages 
 - various other corrections

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18380 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/opkg/patches/007-force_static.patch | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'package/opkg/patches/007-force_static.patch')

diff --git a/package/opkg/patches/007-force_static.patch b/package/opkg/patches/007-force_static.patch
index b433eed05..632250863 100644
--- a/package/opkg/patches/007-force_static.patch
+++ b/package/opkg/patches/007-force_static.patch
@@ -1,8 +1,8 @@
 --- a/libopkg/Makefile.am
 +++ b/libopkg/Makefile.am
-@@ -30,15 +30,10 @@ opkg_util_sources = file_util.c file_uti
- 		    sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
- 		    xregex.c xregex.h xsystem.c xsystem.h
+@@ -36,16 +36,10 @@
+ opkg_util_sources += sha256.c sha256.h
+ endif
  
 -lib_LTLIBRARIES = libopkg.la
 -libopkg_la_SOURCES = \
@@ -12,16 +12,17 @@
  	$(opkg_cmd_sources) $(opkg_db_sources) \
  	$(opkg_util_sources) $(opkg_list_sources)
  
--libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS)
+-libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
+-
 -# make sure we only export symbols that are for public use
 -libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
 -
 -
 -
-+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS)
++libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
 --- a/libbb/Makefile.am
 +++ b/libbb/Makefile.am
-@@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@
+@@ -2,9 +2,9 @@
  BUILD_CPU=@build_cpu@
  ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
  
@@ -35,17 +36,17 @@
  	wfopen.c \
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL
+@@ -2,5 +2,5 @@
  bin_PROGRAMS = opkg-cl
  
  opkg_cl_SOURCES = opkg-frontend.c
 -opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
 -                $(top_builddir)/libbb/libbb.la 
 +opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
-+                $(top_builddir)/libbb/libbb.a 
++                $(top_builddir)/libbb/libbb.a
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test
+@@ -16,7 +16,7 @@
  #opkg_active_list_test_SOURCES = opkg_active_list_test.c
  #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
  
-- 
cgit v1.2.3