From 94d295e25ec90613bf81e866548e7b9ca1981178 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 4 Nov 2015 21:44:03 +0100 Subject: [PATCH] fossl: update to 1.34 Signed-off-by: Luka Perkov --- net/fossil/Makefile | 4 ++-- .../patches/{no_https.patch => 001-no_https.patch} | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename net/fossil/patches/{no_https.patch => 001-no_https.patch} (51%) diff --git a/net/fossil/Makefile b/net/fossil/Makefile index 656c83ccb..687c7997c 100644 --- a/net/fossil/Makefile +++ b/net/fossil/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fossil -PKG_VERSION:=1.33 +PKG_VERSION:=1.34 PKG_RELEASE:=1 PKG_LICENSE:=BSD-2-Clause @@ -16,7 +16,7 @@ PKG_MAINTAINER:=Luka Perkov PKG_SOURCE:=$(PKG_NAME)-src-${PKG_VERSION}.tar.gz PKG_SOURCE_URL:=http://www.fossil-scm.org/download/ -PKG_MD5SUM:=53f8145084a2065d6cb734980c172c7e +PKG_MD5SUM:=3d5a7da5c506a47784942236a788b29b PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-src-$(PKG_VERSION) diff --git a/net/fossil/patches/no_https.patch b/net/fossil/patches/001-no_https.patch similarity index 51% rename from net/fossil/patches/no_https.patch rename to net/fossil/patches/001-no_https.patch index 411504f78..cd83ffa75 100644 --- a/net/fossil/patches/no_https.patch +++ b/net/fossil/patches/001-no_https.patch @@ -1,18 +1,18 @@ --- a/Makefile.classic +++ b/Makefile.classic -@@ -41,9 +41,6 @@ TCC = gcc -g -Os -Wall +@@ -41,9 +41,6 @@ # FOSSIL_ENABLE_MINIZ = 1 # TCC += -DFOSSIL_ENABLE_MINIZ -# To add support for HTTPS -TCC += -DFOSSIL_ENABLE_SSL - - #### Extra arguments for linking the finished binary. Fossil needs - # to link against the Z-Lib compression library unless the miniz - # library in the source tree is being used. There are no other -@@ -58,9 +55,6 @@ ZLIB_LIB. = $(ZLIB_LIB.0) + #### We sometimes add the -static option here so that we can build a + # static executable that will run in a chroot jail. + #LIB = -static +@@ -60,9 +57,6 @@ # If using zlib: - LIB = $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS) + LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS) -# If using HTTPS: -LIB += -lcrypto -lssl