From patchwork Tue Sep 22 18:25:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 3488 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BwqWF1fZpz3wbW for ; Tue, 22 Sep 2020 18:26:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BwqW165hLz13Q; Tue, 22 Sep 2020 18:25:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BwqW15LVNz30WQ; Tue, 22 Sep 2020 18:25:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BwqW0478jz2xTN for ; Tue, 22 Sep 2020 18:25:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BwqVy11mHz12h; Tue, 22 Sep 2020 18:25:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1600799146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYElgU2tPXk59wZv2BNlUtO4OMrPT+Yv9rw/zjzeR3U=; b=xUKGqcEZiQTKNLeTDH4PCkG/86C5rStGH3SF9uI//dX+Q4u2PUGcVGTfnR0RVeJz7p6wr7 JBX5w1fcuMgbd2AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1600799146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYElgU2tPXk59wZv2BNlUtO4OMrPT+Yv9rw/zjzeR3U=; b=G9IEkp1B/OfthtxUM5v+/k29k9wZDJoq5KsB0Ji1967G6oS7Amd6w2q1YTGUW5iVlSPxjJ 4ScyltXNzsZ+lazW5GR8Y13yXNgUjxKcs/+zj2Pbwu0UrLTF9NtzHGI3EIZtwQcYzNMTTK GAAaHeco2e49g3k51jnCBF+rjq3vM1TL0emnwwfgv7opq9TsH3YV/Jt+/+pbxT0GiwcVKA M4A4GBvggeWYmuv8ZBph3K/XJ8SdiCD+k8YncAKwYCDtrdmo3GDU9kXUSQb1pq2hrQOcij +plIZ8gj4v5RvdYj3e5NpilAx7Rj20HLjvC2h4bnkLXQXQLuFf2udE1Nb2IlBw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 11/11] libloc: Update to 0.9.4 Date: Tue, 22 Sep 2020 20:25:09 +0200 Message-Id: <20200922182509.18643-11-stefan.schantl@ipfire.org> In-Reply-To: <20200922182509.18643-1-stefan.schantl@ipfire.org> References: <20200922182509.18643-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Also update to the shipped database to 2020-09-21. Signed-off-by: Stefan Schantl --- lfs/libloc | 12 ++++------ ...te-buffer-when-reading-from-database.patch | 24 ------------------- ...c-0.9.3-location-provide-return-code.patch | 22 ----------------- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch delete mode 100644 src/patches/libloc-0.9.3-location-provide-return-code.patch diff --git a/lfs/libloc b/lfs/libloc index 178f9f9cc..da53e5149 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -24,8 +24,8 @@ include Config -VER = 0.9.3 -DB_DATE = 2020-07-10 +VER = 0.9.4 +DB_DATE = 2020-09-21 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,8 +43,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = https://source.ipfire.org/releases/libloc//$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz -$(DL_FILE)_MD5 = 61f1d543f67baf665b0140d3676fdade -location-$(DB_DATE).db.xz_MD5 = 3f68f631e94c29b953c4e60454567540 +$(DL_FILE)_MD5 = 82770e9eba20f636c96e6fa42ff234b5 +location-$(DB_DATE).db.xz_MD5 = fa3069bf31170629d638317e283913c0 install : $(TARGET) @@ -78,10 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) - # Apply upstream patches - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-location-provide-return-code.patch - # Add patch for i586 to disable strong stack protector. ifeq "$(BUILD_ARCH)" "i586" cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch diff --git a/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch b/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch deleted file mode 100644 index 0ad9229fd..000000000 --- a/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 61d3516bbfce6b4e6393825329c07b1e2a88d47d -Author: Michael Tremer -Date: Mon Jul 13 10:47:30 2020 +0000 - - country: Terminate buffer when reading from database - - Compilers on ARM do not seem to initialise the buffer. - - Signed-off-by: Michael Tremer - -diff --git a/src/country.c b/src/country.c -index d6ddf50..2ba93e6 100644 ---- a/src/country.c -+++ b/src/country.c -@@ -125,6 +125,9 @@ int loc_country_new_from_database_v1(struct loc_ctx* ctx, struct loc_stringpool* - // Read country code - loc_country_code_copy(buffer, dbobj->code); - -+ // Terminate buffer -+ buffer[2] = '\0'; -+ - // Create a new country object - int r = loc_country_new(ctx, country, buffer); - if (r) diff --git a/src/patches/libloc-0.9.3-location-provide-return-code.patch b/src/patches/libloc-0.9.3-location-provide-return-code.patch deleted file mode 100644 index 2382145c3..000000000 --- a/src/patches/libloc-0.9.3-location-provide-return-code.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 1be0681cc4bcc006369e69d90dc4439eaa6f58d5 -Author: Stefan Schantl -Date: Wed Jul 29 18:50:20 2020 +0200 - - location: Provide a return code if the database does not need to be - updated. - - Signed-off-by: Stefan Schantl - -diff --git a/src/python/location.in b/src/python/location.in -index 5211b28..8cdd140 100644 ---- a/src/python/location.in -+++ b/src/python/location.in -@@ -416,7 +416,7 @@ class CLI(object): - _("The datase has recently be updated recently (%s)") % \ - format_timedelta(now - t), - ) -- return -+ return 3 - - # Fetch the timestamp we need from DNS - t = location.discover_latest_version()