From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] mpage: Update to 2.5.7
Date: Mon, 08 Feb 2021 20:56:58 +0100
Message-ID: <20210208195658.3201190-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7772791390423482955=="
List-Id: <development.lists.ipfire.org>

--===============7772791390423482955==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 <adolf.belka(a)ipfire.org>
---
 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 @@
=20
 include Config
=20
-VER        =3D 2.5.6
+VER        =3D 2.5.7
=20
 THISAPP    =3D mpage-$(VER)
 DL_FILE    =3D $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 489663c9246e47915cea931348e5175d
+$(DL_FILE)_MD5 =3D 8d94338445345a554fd3bc664d48525a
=20
 install : $(TARGET)
=20
diff --git a/src/patches/mpage25-config.patch b/src/patches/mpage25-config.pa=
tch
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=3Dgcc
+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=3Dgcc
  #  See glob.c for all possibilities
  #
  # PAGESIZE=3DLetter
@@ -10,7 +10,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
 =20
  #
  # Define your spooler type
-@@ -50,7 +50,7 @@ PAGESIZE=3DA4
+@@ -58,7 +58,7 @@ PAGESIZE=3DA4
  SPOOL_TYPE=3DBSD_SPOOLER
 =20
  # PREFIX=3De:/usr		# OS/2 type
@@ -19,7 +19,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
  #PREFIX=3D/usr
  BINDIR=3D$(PREFIX)/bin
  LIBDIR=3D$(PREFIX)/share
-@@ -73,7 +73,7 @@ SHEETMARGIN=3D18=20
+@@ -81,7 +81,7 @@ SHEETMARGIN=3D18
  #
  DEFAULT_DUPLEX=3D0
 =20
@@ -28,7 +28,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
 =20
 =20
  ############################################################################
-@@ -107,7 +107,7 @@ O =3D .o
+@@ -115,7 +115,7 @@ O =3D .o
  # If you are using gcc, you probably don't need to change anything here.
 =20
  # Linux:
@@ -37,7 +37,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
 =20
  # AIX (xlC on aix 4):
  #CFLAGS =3D -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)
--=20
2.30.0


--===============7772791390423482955==--