From patchwork Sat Jan 4 16:49:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2675 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 47qnmm39Z4z3xY5 for ; Sat, 4 Jan 2020 16:49:28 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnmk2VjBz2Km; Sat, 4 Jan 2020 16:49:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnmj6Rl4z2ycc; Sat, 4 Jan 2020 16:49:25 +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 47qnmg6m4Sz2xdK for ; Sat, 4 Jan 2020 16:49:23 +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 47qnmg4ylMz2Km; Sat, 4 Jan 2020 16:49:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156563; 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; bh=zQeODLJ1yhpXLftwb7X7ONSUNXipy7vti7kap+iALmg=; b=evCv8//I5MN/hIb+Y+wf0jRsEkhhZ/gkoazMHYI7nfPIMTGHBsjOkcqOCMjxmhnLst5Rur sih0GMFogrvcynDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156563; 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; bh=zQeODLJ1yhpXLftwb7X7ONSUNXipy7vti7kap+iALmg=; b=QjjvAwoWvaExbz6+j4q9qWRYiIp3+5D/RCzGBhEmsGjaxXTHgc6ZlebmX36wJl30q5vc/Q ZbwsDSFKm9xloHp5cjaCBiUDfj1MTALbIzWNA5BTEexfBOH6u7LsdQYfgQ6qJ9oXQnV/bq mJCBm+J5XitUbVNJrbLD3qSNJqyM35LRi6c6xOF6qAGuLk3DA8ri+8/n3y6KqXNZTE7uPJ cJT6RPOAqUCq6RFspmri89K2l9Un+tbE0Wx1Yy+hXgNtbI3Q7NO4CTYO1nf42p1fIac0rh Af6EybQff87VfJyd7XL+TmYR+laN1pTHFcxw8GJ6knMDVtkBn/4Z4XOxQz+UbQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/6] mpfr: Update to 4.0.2 Date: Sat, 4 Jan 2020 16:49:11 +0000 Message-Id: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/mpfr | 6 ++++-- lfs/mpfr | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr index 34c4dbe78..4b6cdf424 100644 --- a/config/rootfiles/common/mpfr +++ b/config/rootfiles/common/mpfr @@ -3,8 +3,9 @@ #usr/lib/libmpfr.a #usr/lib/libmpfr.la #usr/lib/libmpfr.so -usr/lib/libmpfr.so.4 -usr/lib/libmpfr.so.4.1.5 +usr/lib/libmpfr.so.6 +usr/lib/libmpfr.so.6.0.2 +#usr/lib/pkgconfig/mpfr.pc #usr/share/doc/mpfr #usr/share/doc/mpfr/AUTHORS #usr/share/doc/mpfr/BUGS @@ -15,6 +16,7 @@ usr/lib/libmpfr.so.4.1.5 #usr/share/doc/mpfr/TODO #usr/share/doc/mpfr/examples #usr/share/doc/mpfr/examples/ReadMe +#usr/share/doc/mpfr/examples/can_round.c #usr/share/doc/mpfr/examples/divworst.c #usr/share/doc/mpfr/examples/rndo-add.c #usr/share/doc/mpfr/examples/sample.c diff --git a/lfs/mpfr b/lfs/mpfr index 2c6a5a6d9..daedd013c 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -24,7 +24,7 @@ include Config -VER = 3.1.5 +VER = 4.0.2 THISAPP = mpfr-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c4ac246cf9795a4491e7766002cd528f +$(DL_FILE)_MD5 = 320fbc4463d4c8cb1e566929d8adc4f8 install : $(TARGET) From patchwork Sat Jan 4 16:49:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2676 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 47qnmm6YLkz3yQm for ; Sat, 4 Jan 2020 16:49:28 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnmk6Vv9z4Pg; Sat, 4 Jan 2020 16:49:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnmk1cqbz2ycT; Sat, 4 Jan 2020 16:49:26 +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 47qnmh0l0vz2xmg for ; Sat, 4 Jan 2020 16:49:24 +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 47qnmg6kDqz4G9; Sat, 4 Jan 2020 16:49:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156564; 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=c2WKp8roCeJd5xNff5qfCL7IdQ1fcaCAkMO9/XduZzI=; b=T/5rVQk0K8hRznnVDuEhcuG3RFIrEixG+Xp2ZSmSr7xgR/bkCAK4IIyOYMt1o0/3O+iF58 PZyBw9Kn7rIKZwCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156564; 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=c2WKp8roCeJd5xNff5qfCL7IdQ1fcaCAkMO9/XduZzI=; b=Vt4mS6O8FXImI2WvTE7O6cQL3Smr1u5un0poZEFZcEmvBeEpfXdYzBReomPm7Nrtt6Pqtv OnpX9IOeAu6ffIdt7nQLxktXLXGuF7WTkIpJ5y45OLVEQSEVA593NK5L4UqyALxnG9Fpit rGBgoqxPVD2qfApSdCd4qy2PT1b12t9tbV8KJKyFf903Dq0wxnguJ4i+JFW2oxtbOY1Vnn bIF5GdsqPTDsxdbC2Vq+sivuEWZ4bm1RIE9XG6uC8QgheeU+e8XQCybGJdQFj6FwP5HUEJ CB4IV3jZbguJfj47/6HdRv8poAmB6jNbsgTesP6kVOwhxMTAKIS3spAcXUei5g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/6] mpc: Update to 1.1.0 Date: Sat, 4 Jan 2020 16:49:12 +0000 Message-Id: <20200104164916.12051-2-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/libmpc | 2 +- lfs/libmpc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/libmpc b/config/rootfiles/common/libmpc index c8684ceab..01412ee8c 100644 --- a/config/rootfiles/common/libmpc +++ b/config/rootfiles/common/libmpc @@ -3,5 +3,5 @@ #usr/lib/libmpc.la #usr/lib/libmpc.so usr/lib/libmpc.so.3 -usr/lib/libmpc.so.3.0.0 +usr/lib/libmpc.so.3.1.0 #usr/share/info/mpc.info diff --git a/lfs/libmpc b/lfs/libmpc index b0111b862..65a34efd1 100644 --- a/lfs/libmpc +++ b/lfs/libmpc @@ -24,7 +24,7 @@ include Config -VER = 1.0.3 +VER = 1.1.0 THISAPP = mpc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d6a1d5f8ddea3abd2cc3e98f58352d26 +$(DL_FILE)_MD5 = 4125404e41e482ec68282a2e687f6c73 install : $(TARGET) From patchwork Sat Jan 4 16:49:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2677 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 47qnmp1Sdwz3xY5 for ; Sat, 4 Jan 2020 16:49:30 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnml1Wghz4Qc; Sat, 4 Jan 2020 16:49:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnmk3WmGz2yd6; Sat, 4 Jan 2020 16:49:26 +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 47qnmh4WRqz2xdK for ; Sat, 4 Jan 2020 16:49:24 +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 47qnmh0Qbnz4PG; Sat, 4 Jan 2020 16:49:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156564; 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=QhMmUuiA5jIB1xfI5zp2zBsk0a/j2MbGAS8kUzmM/lU=; b=r1TA7Dj3lS3uCBBoptpm2AGYPeGjdJdEBUSJi3586yEQ/ppUKpyIwUL1guYijto8vzhH4p pvEZDkkk/Lcf/lCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156564; 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=QhMmUuiA5jIB1xfI5zp2zBsk0a/j2MbGAS8kUzmM/lU=; b=aXX1OOlrRV1Zmv2tMjiOozISoGAzM1dhBFxHvFR5AbMpJX+D/UVctqZpdia2ClQ0wDjcWz 6HBTTeMb61Gr8MPBbUIPVv3Fnb1z9/v+jbrM2jFYb4gjgZ1V9/9p4fJsYN3rgX7XW/rEZJ G8MV+8a9iOTRbXY7wIMMQ+xcU1DyBl9rq4/OlQbku4VbGlcJb6gNE0SQ9X42mRBrDc8hSb kpGC4/7o3fZjUCq29S0XWyF+QErVz8cfddWDYQ+cQohmXKYkI9U+Nm/qeZuuX+WcZW7RV2 h34+E1M9zax6lFAow4f5VKGIFZMPG3E4SnMOvHlppPgD/6o2oFJh5L2vPlOFeg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/6] mdadm: Update to 4.1 Date: Sat, 4 Jan 2020 16:49:13 +0000 Message-Id: <20200104164916.12051-3-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/mdadm | 4 +++- lfs/mdadm | 6 +++--- src/patches/mdadm/gcc-7.patch | 12 ------------ 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 src/patches/mdadm/gcc-7.patch diff --git a/config/rootfiles/common/mdadm b/config/rootfiles/common/mdadm index 00d38a8c8..08d422b94 100644 --- a/config/rootfiles/common/mdadm +++ b/config/rootfiles/common/mdadm @@ -1,9 +1,11 @@ +lib/udev/rules.d/01-md-raid-creating.rules lib/udev/rules.d/63-md-raid-arrays.rules lib/udev/rules.d/64-md-raid-assembly.rules +lib/udev/rules.d/69-md-clustered-confirm-device.rules sbin/mdadm sbin/mdmon +srv/web/ipfire/cgi-bin/mdstat.cgi #usr/share/man/man4/md.4 #usr/share/man/man5/mdadm.conf.5 #usr/share/man/man8/mdadm.8 #usr/share/man/man8/mdmon.8 -srv/web/ipfire/cgi-bin/mdstat.cgi diff --git a/lfs/mdadm b/lfs/mdadm index 3e8444cbf..19d678f93 100644 --- a/lfs/mdadm +++ b/lfs/mdadm @@ -24,7 +24,7 @@ include Config -VER = 4.0 +VER = 4.1 THISAPP = mdadm-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2cb4feffea9167ba71b5f346a0c0a40d +$(DL_FILE)_MD5 = 51bf3651bd73a06c413a2f964f299598 install : $(TARGET) @@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mdadm/gcc-7.patch + cd $(DIR_APP) && sed 's@-Werror@@' -i Makefile cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/mdadm/gcc-7.patch b/src/patches/mdadm/gcc-7.patch deleted file mode 100644 index 20606d21f..000000000 --- a/src/patches/mdadm/gcc-7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mdadm-4.0.org/Makefile mdadm-4.0/Makefile ---- mdadm-4.0.org/Makefile 2017-01-09 22:46:34.000000000 +0100 -+++ mdadm-4.0/Makefile 2018-01-19 11:18:42.868219725 +0100 -@@ -43,7 +43,7 @@ - - CC ?= $(CROSS_COMPILE)gcc - CXFLAGS ?= -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -+CWFLAGS = -Wall -Werror -Werror=implicit-fallthrough=0 -Werror=format-overflow=0 -Werror=format-truncation=0 -Wstrict-prototypes -Wextra -Wno-unused-parameter - ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 - endif From patchwork Sat Jan 4 16:49:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2678 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 47qnmq1hVqz3yQm for ; Sat, 4 Jan 2020 16:49:31 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnml3xqgz4W7; Sat, 4 Jan 2020 16:49:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnmk5NCdz2ycc; Sat, 4 Jan 2020 16:49:26 +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 47qnmj0Jnxz2xdK for ; Sat, 4 Jan 2020 16:49:25 +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 47qnmh4d2mz4G9; Sat, 4 Jan 2020 16:49:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156564; 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=qcaqv80FX0EUBw4jWri0A++e8seTA53OYHHh1aObCTw=; b=ufDFV/+0Qb9ony0JhGkE/PCoGg5kBxc2+q5GNEMoDYPPSNZwL0WKbkN7a+Aq99eNZXbOK3 9iCdNAUIaBSnuBBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156564; 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=qcaqv80FX0EUBw4jWri0A++e8seTA53OYHHh1aObCTw=; b=CxR099ns4TNQ21p58iSQnet5iVWDeMPq5yB5pYW4w6zxBLETFDKSSbn8pspFDDs6dG6OTK +9s00QGC7/Bx7sMGbySt5tJF10iMIOg2lrJP5VrktjgmHlJpEl8+UgUGbYJ4eL2N8WO/K6 oQWbKh0cd0+8CCKFuh95myIqe9gKak8T6QDTjJeV2tO5YqwTEO6FqRBSkdhTz7gJo1Pf57 k0v8A/qJ1rkNhJ2wN7+opogOUiMaeHadzmioJhOWl6RWWCZ0fGoNhxYSgyeSdVP+jg92Qc /hHLKmwx4ppJMV+ZxG6W8h6enkFjkBOqcrbsGo/UpZPv3LfrQsYOAWPhxEXSYw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/6] efivar: Update to 37 Date: Sat, 4 Jan 2020 16:49:14 +0000 Message-Id: <20200104164916.12051-4-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This also fixes some build issues with GCC 9. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/efivar | 4 +- config/rootfiles/common/x86_64/efivar | 4 +- lfs/efivar | 6 +- src/patches/efivar-37-compile-fixes-1.patch | 56 +++++++ src/patches/efivar-37-compile-fixes-2.patch | 168 ++++++++++++++++++++ 5 files changed, 232 insertions(+), 6 deletions(-) create mode 100644 src/patches/efivar-37-compile-fixes-1.patch create mode 100644 src/patches/efivar-37-compile-fixes-2.patch diff --git a/config/rootfiles/common/aarch64/efivar b/config/rootfiles/common/aarch64/efivar index 4018e4c08..4fd100167 100644 --- a/config/rootfiles/common/aarch64/efivar +++ b/config/rootfiles/common/aarch64/efivar @@ -8,10 +8,10 @@ usr/bin/efivar #usr/include/efivar/efivar.h #usr/lib/libefiboot.so usr/lib/libefiboot.so.1 -usr/lib/libefiboot.so.1.35 +usr/lib/libefiboot.so.1.37 #usr/lib/libefivar.so usr/lib/libefivar.so.1 -usr/lib/libefivar.so.1.35 +usr/lib/libefivar.so.1.37 #usr/lib/pkgconfig/efiboot.pc #usr/lib/pkgconfig/efivar.pc #usr/share/man/man1/efivar.1 diff --git a/config/rootfiles/common/x86_64/efivar b/config/rootfiles/common/x86_64/efivar index 4018e4c08..4fd100167 100644 --- a/config/rootfiles/common/x86_64/efivar +++ b/config/rootfiles/common/x86_64/efivar @@ -8,10 +8,10 @@ usr/bin/efivar #usr/include/efivar/efivar.h #usr/lib/libefiboot.so usr/lib/libefiboot.so.1 -usr/lib/libefiboot.so.1.35 +usr/lib/libefiboot.so.1.37 #usr/lib/libefivar.so usr/lib/libefivar.so.1 -usr/lib/libefivar.so.1.35 +usr/lib/libefivar.so.1.37 #usr/lib/pkgconfig/efiboot.pc #usr/lib/pkgconfig/efivar.pc #usr/share/man/man1/efivar.1 diff --git a/lfs/efivar b/lfs/efivar index 90d4c57e7..a2e86a255 100644 --- a/lfs/efivar +++ b/lfs/efivar @@ -24,7 +24,7 @@ include Config -VER = 35 +VER = 37 THISAPP = efivar-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 53da18ea0cf7bba1fd9edf3098037edf +$(DL_FILE)_MD5 = 9f067275c5f7aafdd75bfb364280ac9c install : $(TARGET) @@ -72,6 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-2.patch cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/efivar-37-compile-fixes-1.patch b/src/patches/efivar-37-compile-fixes-1.patch new file mode 100644 index 000000000..f40942f45 --- /dev/null +++ b/src/patches/efivar-37-compile-fixes-1.patch @@ -0,0 +1,56 @@ +From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 7 Jan 2019 10:30:59 -0500 +Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers + safely. + +GCC 9 adds -Werror=address-of-packed-member, which causes us to see the +build error reported at + https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . + +That bug report shows us the following: + +In file included from dp.c:26: +dp.h: In function 'format_vendor_helper': +dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] + 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +dp.h:74:25: note: in definition of macro 'format_guid' + 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ + | ^~~~ +cc1: all warnings being treated as errors + +This patch makes format_guid() use a local variable as a bounce buffer +in the case that the guid we're passed is aligned as chaotic neutral. + +Note that this only fixes this instance and there may be others that bz +didn't show because it exited too soon, and I don't have a gcc 9 build +in front of me right now. + +Signed-off-by: Peter Jones +--- + src/dp.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr = NULL; \ +- \ +- _rc = efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p = \ ++ likely(__alignof__(guid) == sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) == sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ diff --git a/src/patches/efivar-37-compile-fixes-2.patch b/src/patches/efivar-37-compile-fixes-2.patch new file mode 100644 index 000000000..bbb6a99a3 --- /dev/null +++ b/src/patches/efivar-37-compile-fixes-2.patch @@ -0,0 +1,168 @@ +From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 21 Feb 2019 15:20:12 -0500 +Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. + +This gets rid of all the places GCC 9's -Werror=address-of-packed-member +flags as problematic. + +Fixes github issue #123 + +Signed-off-by: Peter Jones +--- + src/dp-message.c | 6 ++++-- + src/dp.h | 12 ++++-------- + src/guid.c | 2 +- + src/include/efivar/efivar.h | 2 +- + src/ucs2.h | 27 +++++++++++++++++++-------- + 5 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/dp-message.c b/src/dp-message.c +index 3724e5f..9f96466 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=0; i < end; i++) { +- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i != 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +diff --git a/src/dp.h b/src/dp.h +index 20cb608..1f921d5 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr = NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p = \ +- likely(__alignof__(guid) == sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) == sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p = &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr = onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc = format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +diff --git a/src/guid.c b/src/guid.c +index 306c9ff..3156b3b 100644 +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; + + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h +index 316891c..ad6449d 100644 +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) + + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); + + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +diff --git a/src/ucs2.h b/src/ucs2.h +index dbb5900..edd8367 100644 +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) + + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) ++ const uint16_t *s = vs; ++ const uint8_t *s8 = vs; ++ ++ for (i = 0; ++ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; ++ i++, s8 += 2, s++) + ; + return i; + } + + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc = ucs2len(s, limit); + rc *= sizeof (uint16_t); +@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) + } + + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars = voidchars; + + if (limit < 0) + limit = ucs2len(chars, -1); +@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) + } + + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 = ucs2void; ++ uint16_t val16; + + if (!ucs2 && size > 0) { + errno = EINVAL; +@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) + val = utf8[i] & 0x7f; + i += 1; + } +- ucs2[j] = val; ++ val16 = val; ++ ucs2[j] = val16; ++ } ++ if (terminate) { ++ val16 = 0; ++ ucs2[j++] = val16; + } +- if (terminate) +- ucs2[j++] = (uint16_t)0; + return j; + }; + From patchwork Sat Jan 4 16:49:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2680 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 47qnmv0CKVz3yQm for ; Sat, 4 Jan 2020 16:49:35 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnml5qVTz63g; Sat, 4 Jan 2020 16:49:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnml0f0wz2ydB; Sat, 4 Jan 2020 16:49:27 +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 47qnmj1FF4z2ySJ for ; Sat, 4 Jan 2020 16:49:25 +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 47qnmj0PKYz2Km; Sat, 4 Jan 2020 16:49:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b21Mb8NqKQlQfWavYQsh/m+4SJXp3nvyqI6c324KGhc=; b=RH2DvqTPok0ZvOGAPuGoVcV7nFlFzZlIVNN37FPRmBukPV3BfND4FzAGX2Xtny5lvj1GS3 +IP309D7j19a/tCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b21Mb8NqKQlQfWavYQsh/m+4SJXp3nvyqI6c324KGhc=; b=L/5wBUjOlrmo4tWjVlxy6MtXb9JasfL1kKn1W+Hppbq14EiSa4oWGu0l6MV5NHO/xmJ8ii JBIwqgvTK5sAb3K3WTVxjImbcG4gXH56803jI27J5imRVK741NyRL3zDyRARy1a8lG/BoJ oVWOyyM426Iqfu3HotxBMsrx0cIf6us7VrboYVlGM3sLMccVMfZcNDeibAPiEcpgF2HXMz TdMGjXWKMlJo1du50HSFJXLBAAiwH7HYAcNzi4NJUE54vSMb6FjKdlLSCl/PYhFUf3Ar30 ZwAFrh+Ss2KI8uwzoTlTkDfduxqGelyVbEmbDUwiFQ7s6rqKWZDuZErubQYEeA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 5/6] glib: Fix compiling with GCC 9 Date: Sat, 4 Jan 2020 16:49:15 +0000 Message-Id: <20200104164916.12051-5-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/glib | 1 + src/patches/glib-2.54.3-compile-fixes-1.patch | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/patches/glib-2.54.3-compile-fixes-1.patch diff --git a/lfs/glib b/lfs/glib index eb284dd56..662caab90 100644 --- a/lfs/glib +++ b/lfs/glib @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glib-2.54.3-compile-fixes-1.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --with-pcre=system cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/glib-2.54.3-compile-fixes-1.patch b/src/patches/glib-2.54.3-compile-fixes-1.patch new file mode 100644 index 000000000..ecf30ded5 --- /dev/null +++ b/src/patches/glib-2.54.3-compile-fixes-1.patch @@ -0,0 +1,71 @@ +From 566e1d61a500267c7849ad0b2552feec9c9a29a6 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Tue, 29 Jan 2019 09:50:46 +0100 +Subject: [PATCH] gdbus: Avoid printing null strings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This mostly affects the 2.56 branch, but, given that GCC 9 is being +stricter about passing null string pointers to printf-like functions, it +might make sense to proactively fix such calls. + +gdbusauth.c: In function '_g_dbus_auth_run_server': +gdbusauth.c:1302:11: error: '%s' directive argument is null +[-Werror=format-overflow=] + 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", + line); + | + +gdbusmessage.c: In function ‘g_dbus_message_to_blob’: +gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] + 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); + | +--- + gio/gdbusauth.c | 2 +- + gio/gdbusmessage.c | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c +index 1f8ea8057..752ec23fc 100644 +--- a/gio/gdbusauth.c ++++ b/gio/gdbusauth.c +@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, + &line_length, + cancellable, + error); +- debug_print ("SERVER: WaitingForBegin, read '%s'", line); + if (line == NULL) + goto out; ++ debug_print ("SERVER: WaitingForBegin, read '%s'", line); + if (g_strcmp0 (line, "BEGIN") == 0) + { + /* YAY, done! */ +diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c +index 3221b925d..3a1a1f9e9 100644 +--- a/gio/gdbusmessage.c ++++ b/gio/gdbusmessage.c +@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message, + if (message->body != NULL) + { + gchar *tupled_signature_str; +- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); + if (signature == NULL) + { + g_set_error (error, +@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message, + G_IO_ERROR_INVALID_ARGUMENT, + _("Message body has signature “%s” but there is no signature header"), + signature_str); +- g_free (tupled_signature_str); + goto out; + } +- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) ++ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); ++ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) + { + g_set_error (error, + G_IO_ERROR, +-- +2.22.0 + From patchwork Sat Jan 4 16:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2679 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 47qnmt4YrLz3xY5 for ; Sat, 4 Jan 2020 16:49:34 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnmm0qGcz64b; Sat, 4 Jan 2020 16:49:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnml2DkDz2ycT; Sat, 4 Jan 2020 16:49:27 +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 47qnmj2JWpz2ybd for ; Sat, 4 Jan 2020 16:49:25 +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 47qnmj1MJgz4PG; Sat, 4 Jan 2020 16:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156565; 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=0PuHDS3TguyluH92EjR8PIT2WJ4wdStrsyH7lE+lCtY=; b=nE3qxsNUncGP60CPT8bR2B1M/KQ8bmBmUG5MA5SfL1oKZL1cY+AbO9/KeWmRmdf9KlmUdN lm3DmnABy34Lhwk1LiPopzB4upvffvLhFuy9Nethc7nyGj9UjMoEIMHGsahN/HPe1IaEXR sImJTKgejCWay+ZELz4LDDACKxRkyWgCAFnpPTB25UQ7351XZfedpI6guv7gI6dEP2R0Tb yEDW4Uxm44fdbai2xvHbvmOHc7szpyu72rGp9pN8iCQCILJvTN7WFhhkwoHn53iuiX2+9I oPQKIpCReXUKJ/aPivQxPhk/1fdntiwNcik0eYOW+R4JrOw8L3o5+HFoM+p2qw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156565; 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=0PuHDS3TguyluH92EjR8PIT2WJ4wdStrsyH7lE+lCtY=; b=KmC/E5XdRUXkSbg+yOfcVk0lHYj36puUxDLq19vbOAn3VG9iP9GxfHUer+5zfURQjZ2p91 fpUNsUgDLt5wtnBQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 6/6] openvmtools: Update to 11.0.0 Date: Sat, 4 Jan 2020 16:49:16 +0000 Message-Id: <20200104164916.12051-6-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/openvmtools | 2 ++ lfs/openvmtools | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools index 35a33dd97..de1ec10c4 100644 --- a/config/rootfiles/packages/openvmtools +++ b/config/rootfiles/packages/openvmtools @@ -11,6 +11,7 @@ etc/vmware-tools/scripts/vmware etc/vmware-tools/scripts/vmware/network etc/vmware-tools/statechange.subr etc/vmware-tools/suspend-vm-default +etc/vmware-tools/tools.conf.example etc/vmware-tools/vm-support lib/udev/rules.d/99-vmware-scsi-udev.rules sbin/mount.vmhgfs @@ -56,6 +57,7 @@ usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so +usr/lib/open-vm-tools/plugins/vmusr #usr/lib/pkgconfig/vmguestlib.pc usr/sbin/mount.vmhgfs #usr/share/open-vm-tools diff --git a/lfs/openvmtools b/lfs/openvmtools index 2246dfd4e..296ba28bb 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -24,7 +24,7 @@ include Config -VER = 10.2.0-7253323 +VER = 11.0.0-14549434 THISAPP = open-vm-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 i586 PROG = openvmtools -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9256c2402640ad19eb79cf49635e01b5 +$(DL_FILE)_MD5 = d3d4e23b143c921f1afc90e5331d3a70 install : $(TARGET)