add CPE ids to package and tools

[openwrt/staging/lynxis.git] / package / libs / zlib / Makefile

diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index 3e20308ff8300741634e10837f03b2e1670c0809..8c94e076a4d6d4b7d216c758e50e4043983142d0 100644 (file)
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
-PKG_VERSION:=1.2.8
+PKG_VERSION:=1.2.11
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
-PKG_HASH:=36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
+PKG_HASH:=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
 
 PKG_LICENSE:=Zlib
 PKG_LICENSE_FILES:=README
+PKG_CPE=cpe:/a:gnu:zlib
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -45,17 +46,15 @@ define Package/zlib-dev/description
  This package includes the development support files.
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               $(TARGET_CONFIGURE_OPTS) \
-               LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
-               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-               ./configure \
-                       --prefix=/usr \
-                       --shared \
-                       --uname=Linux \
-       );
-endef
+CONFIGURE_VARS := \
+       $(TARGET_CONFIGURE_OPTS) \
+       LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+       CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+
+CONFIGURE_ARGS := \
+       --prefix=/usr \
+       --shared \
+       --uname=Linux \
 
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \