qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-12 00:40:15 +02:00
Code

[opkg] update to r4993

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15901 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-05-17 17:09:12 +00:00
parent 7f464dbf8c
commit 81f76c5079
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/opkg/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2008 OpenWrt.org # Copyright (C) 2006-2009 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=opkg PKG_NAME:=opkg
PKG_REV:=4564 PKG_REV:=4993
PKG_VERSION:=$(PKG_REV) PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=4 PKG_RELEASE:=4

27
package/opkg/patches/001-use-wget
View File

@ -1,6 +1,7 @@
--- opkg-4564/configure.ac-orig 2008-08-04 19:39:20.000000000 -0500 diff -urN opkg-4993/configure.ac opkg-4993.new/configure.ac
+++ opkg-4564/configure.ac 2008-08-04 19:37:17.000000000 -0500 --- opkg-4993/configure.ac 2009-05-17 18:15:52.000000000 +0200
@@ -22,9 +22,16 @@ +++ opkg-4993.new/configure.ac 2009-05-17 18:17:09.000000000 +0200
@@ -26,9 +26,16 @@
# Checks for libraries # Checks for libraries
@ -19,9 +20,10 @@
dnl ********** dnl **********
--- opkg-4564/libopkg/opkg.c-orig 2008-08-04 19:39:38.000000000 -0500 diff -urN opkg-4993/libopkg/opkg.c opkg-4993.new/libopkg/opkg.c
+++ opkg-4564/libopkg/opkg.c 2008-08-04 19:37:17.000000000 -0500 --- opkg-4993/libopkg/opkg.c 2009-05-17 18:15:50.000000000 +0200
@@ -1020,8 +1020,9 @@ +++ opkg-4993.new/libopkg/opkg.c 2009-05-17 18:17:09.000000000 +0200
@@ -1019,8 +1019,9 @@
return package; return package;
} }
@ -32,7 +34,7 @@
/** /**
* @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status.
* @param opkg The opkg_t * @param opkg The opkg_t
@@ -1071,6 +1072,7 @@ @@ -1070,6 +1071,7 @@
repositories--; repositories--;
err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL); err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
@ -40,7 +42,7 @@
if (!(err == CURLE_OK || if (!(err == CURLE_OK ||
err == CURLE_HTTP_RETURNED_ERROR || err == CURLE_HTTP_RETURNED_ERROR ||
err == CURLE_FILE_COULDNT_READ_FILE || err == CURLE_FILE_COULDNT_READ_FILE ||
@@ -1079,6 +1081,7 @@ @@ -1078,6 +1080,7 @@
)) { )) {
ret++; ret++;
} }
@ -48,8 +50,9 @@
str_list_elt_deinit(iter1); str_list_elt_deinit(iter1);
free(iter1); free(iter1);
} }
--- opkg-4564/libopkg/opkg_download.c-orig 2008-08-04 19:39:56.000000000 -0500 diff -urN opkg-4993/libopkg/opkg_download.c opkg-4993.new/libopkg/opkg_download.c
+++ opkg-4564/libopkg/opkg_download.c 2008-08-04 19:37:17.000000000 -0500 --- opkg-4993/libopkg/opkg_download.c 2009-05-17 18:15:50.000000000 +0200
+++ opkg-4993.new/libopkg/opkg_download.c 2009-05-17 18:17:09.000000000 +0200
@@ -17,7 +17,9 @@ @@ -17,7 +17,9 @@
General Public License for more details. General Public License for more details.
*/ */
@ -60,7 +63,7 @@
#ifdef HAVE_GPGME #ifdef HAVE_GPGME
#include <gpgme.h> #include <gpgme.h>
#endif #endif
@@ -76,6 +78,7 @@ @@ -77,6 +79,7 @@
setenv("no_proxy", conf->no_proxy, 1); setenv("no_proxy", conf->no_proxy, 1);
} }
@ -68,7 +71,7 @@
CURL *curl; CURL *curl;
CURLcode res; CURLcode res;
FILE * file = fopen (tmp_file_location, "w"); FILE * file = fopen (tmp_file_location, "w");
@@ -121,6 +124,31 @@ @@ -123,6 +126,31 @@
free(src_basec); free(src_basec);
return -1; return -1;
} }

32
package/opkg/patches/002-remove-gpg-warning
View File

@ -1,6 +1,20 @@
--- opkg-4564/libopkg/opkg_download.c-orig 2008-10-29 22:38:18.000000000 -0500 diff -urN opkg-4993/libopkg/opkg_cmd.c opkg-4993.new/libopkg/opkg_cmd.c
+++ opkg-4564/libopkg/opkg_download.c 2008-10-29 22:39:13.000000000 -0500 --- opkg-4993/libopkg/opkg_cmd.c 2009-05-17 18:15:50.000000000 +0200
@@ -335,7 +335,6 @@ +++ opkg-4993.new/libopkg/opkg_cmd.c 2009-05-17 18:19:50.000000000 +0200
@@ -289,9 +289,6 @@
unlink (tmp_file_name);
free (tmp_file_name);
free (url);
-#else
- opkg_message (conf, OPKG_NOTICE, "Signature check for %s skipped "
- "because GPG support was not enabled in this build\n", src->name);
#endif
free(list_file_name);
}
diff -urN opkg-4993/libopkg/opkg_download.c opkg-4993.new/libopkg/opkg_download.c
--- opkg-4993/libopkg/opkg_download.c 2009-05-17 18:20:17.000000000 +0200
+++ opkg-4993.new/libopkg/opkg_download.c 2009-05-17 18:19:10.000000000 +0200
@@ -374,7 +374,6 @@
return status; return status;
#else #else
@ -8,15 +22,3 @@
return 0; return 0;
#endif #endif
} }
--- opkg-4564/libopkg/opkg_cmd.c-orig 2008-10-29 22:38:25.000000000 -0500
+++ opkg-4564/libopkg/opkg_cmd.c 2008-10-29 22:39:49.000000000 -0500
@@ -287,9 +287,6 @@
unlink (tmp_file_name);
free (tmp_file_name);
free (url);
-#else
- opkg_message (conf, OPKG_NOTICE, "Signiture check for %s skipped "
- "because GPG support was not enabled in this build\n", src->name);
#endif
free(list_file_name);
}