Merge pull request #559 from wigyori/cc-misc2

CC: upgrade openssl, fix ugps compilation

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index ea68f16..2859be4 100644 (file)
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
 PKG_BASE:=1.0.2
-PKG_BUGFIX:=j
+PKG_BUGFIX:=l
 PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        http://www.openssl.org/source/old/$(PKG_BASE)/ \
        ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
-PKG_MD5SUM:=96322138f0b69e61b7212bc53d5e912b
+PKG_MD5SUM:=f85123cd390e864dfbe517e7616e6566
 
 PKG_LICENSE:=OpenSSL
 PKG_LICENSE_FILES:=LICENSE

diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
index 1c8ac6f..1597d7a 100644 (file)
--- a/package/utils/ugps/Makefile
+++ b/package/utils/ugps/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=ugps
 PKG_VERSION:=2015-08-17
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://git.openwrt.org/project/ugps.git
 PKG_SOURCE_PROTO:=git