From patchwork Mon Feb 8 19:56:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3878 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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DZGy51yGXz3wps for ; Mon, 8 Feb 2021 19:57: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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DZGy46hZDzn5; Mon, 8 Feb 2021 19:57:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DZGy461Q0z2xnm; Mon, 8 Feb 2021 19:57:00 +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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DZGy41cW3z2xfh for ; Mon, 8 Feb 2021 19:57:00 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DZGy35flTzmc; Mon, 8 Feb 2021 19:56:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612814219; 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=STyHllHovTeiacREtjGy6aviWEgdcWV1+Z5TAM9xfMo=; b=72VEmAk8f7EZLYTme0RBoIzFPKh0SJOctXXHIPhy8S9DHQ6H73y5FFkRtOfZ+dz6tvtNsn eUuYVGAxeszMk0CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612814219; 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=STyHllHovTeiacREtjGy6aviWEgdcWV1+Z5TAM9xfMo=; b=G9i84JRpAI+O7krRvG7QwbPF0xsAYWsBCxUFP2/yUAApJC+/RpHhgjOnER3pUYxswuarNw 6GhBpXgbRkUR3r+oz88AA97JlAzjDO2pLPhPdq9vmsTyn/ZaKMLmp2HqZs/woQ4y+tUtMz pThEB220gaNQgzZ+B+MbhkVMY4AmI9ixAK3HbEdqgKc3DFNQvW0nJtNP5v6G+SG8kafTo5 VSqkU8/+7Ig3lMrjC7rrUgGCXr//EeodAeHgPrr6OFxwUVBahn/B0aQ5stUuECKuo05SUj WAbQQgISfStxwWhpDhpryn4O/rwUfIczFiaU9WM8dw0n6lS4tM39bje1V2Jk4A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] mpage: Update to 2.5.7 Date: Mon, 8 Feb 2021 20:56:58 +0100 Message-Id: <20210208195658.3201190-1-adolf.belka@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update mpage from 2.5.6 to 2.5.7 - No change to rootfile - Slight tuning of patch needed due to changes in source file - Changelog June 2017 - Released version 2.5.7 - Relicensed code under GPLv2 or later Signed-off-by: Adolf Belka --- lfs/mpage | 4 ++-- src/patches/mpage25-config.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lfs/mpage b/lfs/mpage index 55a1eac65..e4376619c 100644 --- a/lfs/mpage +++ b/lfs/mpage @@ -24,7 +24,7 @@ include Config -VER = 2.5.6 +VER = 2.5.7 THISAPP = mpage-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d +$(DL_FILE)_MD5 = 8d94338445345a554fd3bc664d48525a install : $(TARGET) diff --git a/src/patches/mpage25-config.patch b/src/patches/mpage25-config.patch index fefc54766..55bf34caf 100644 --- a/src/patches/mpage25-config.patch +++ b/src/patches/mpage25-config.patch @@ -1,7 +1,7 @@ -diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile ---- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200 -+++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100 -@@ -40,7 +40,7 @@ CC=gcc +diff -aup mpage-2.5.7/Makefile.orig mpage-2.5.7/Makefile +--- mpage-2.5.7/Makefile.orig 2017-06-28 10:07:41.000000000 +0200 ++++ mpage-2.5.7/Makefile 2021-02-08 13:35:23.219223469 +0100 +@@ -48,7 +48,7 @@ CC=gcc # See glob.c for all possibilities # # PAGESIZE=Letter @@ -10,7 +10,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile # # Define your spooler type -@@ -50,7 +50,7 @@ PAGESIZE=A4 +@@ -58,7 +58,7 @@ PAGESIZE=A4 SPOOL_TYPE=BSD_SPOOLER # PREFIX=e:/usr # OS/2 type @@ -19,7 +19,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile #PREFIX=/usr BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/share -@@ -73,7 +73,7 @@ SHEETMARGIN=18 +@@ -81,7 +81,7 @@ SHEETMARGIN=18 # DEFAULT_DUPLEX=0 @@ -28,7 +28,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile ############################################################################ -@@ -107,7 +107,7 @@ O = .o +@@ -115,7 +115,7 @@ O = .o # If you are using gcc, you probably don't need to change anything here. # Linux: @@ -37,7 +37,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile # AIX (xlC on aix 4): #CFLAGS = -O2 -s $(DEFS) -@@ -183,5 +183,4 @@ install: +@@ -191,5 +191,4 @@ install: if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi cp mpage$(E) $(BINDIR) cp mpage.1 $(MANDIR)