diff -Nru palo-2.12/debian/changelog palo-2.14/debian/changelog --- palo-2.12/debian/changelog 2019-09-10 10:01:26.000000000 +0000 +++ palo-2.14/debian/changelog 2020-05-30 22:20:30.000000000 +0000 @@ -1,3 +1,25 @@ +palo (2.14) unstable; urgency=medium + + [ Helge Deller ] + * Switch to debhelper version 13 + * Improve palo man page + * Update PARISC Linux homepage + * Update Standards-Version to 4.5.0, no changes required + + -- Helge Deller Sat, 30 May 2020 22:20:30 +0000 + +palo (2.13) unstable; urgency=medium + + [ Helge Deller ] + * ipl: Reduce ext4 debug output + * rpm: Fix building rpm package on Fedora 30 via "make rpm" + * Update Standards-Version to 4.4.1, no changes required + + [ Jeroen Roovers ] + * ipl: Ensure no GCC builtins replace string functions + + -- Helge Deller Wed, 20 May 2020 19:35:50 +0000 + palo (2.12) unstable; urgency=medium [ James Bottomley ] diff -Nru palo-2.12/debian/compat palo-2.14/debian/compat --- palo-2.12/debian/compat 2018-01-04 10:20:18.000000000 +0000 +++ palo-2.14/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru palo-2.12/debian/control palo-2.14/debian/control --- palo-2.12/debian/control 2019-09-08 20:00:22.000000000 +0000 +++ palo-2.14/debian/control 2020-05-30 22:00:08.000000000 +0000 @@ -2,9 +2,8 @@ Section: admin Priority: optional Maintainer: Helge Deller -Uploaders: -Build-Depends: debhelper (>= 9), lynx, gcc-hppa-linux-gnu [!hppa], libc6-dev-hppa-cross [!hppa], help2man -Standards-Version: 4.4.0 +Build-Depends: debhelper-compat (= 13), lynx, gcc-hppa-linux-gnu [!hppa], libc6-dev-hppa-cross [!hppa], help2man +Standards-Version: 4.5.0 Homepage: https://git.kernel.org/cgit/linux/kernel/git/deller/palo.git Vcs-Browser: https://git.kernel.org/cgit/linux/kernel/git/deller/palo.git Vcs-Git: git://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git diff -Nru palo-2.12/debian/copyright palo-2.14/debian/copyright --- palo-2.12/debian/copyright 2018-01-04 10:20:18.000000000 +0000 +++ palo-2.14/debian/copyright 2020-05-30 22:00:08.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: palo -Source: http://git.kernel.org/cgit/linux/kernel/git/deller/palo.git +Source: https://git.kernel.org/cgit/linux/kernel/git/deller/palo.git Files: * Copyright: 1999-2005 Paul Bame diff -Nru palo-2.12/ipl/ext2.c palo-2.14/ipl/ext2.c --- palo-2.12/ipl/ext2.c 2019-09-07 13:04:22.000000000 +0000 +++ palo-2.14/ipl/ext2.c 2020-05-30 10:17:00.000000000 +0000 @@ -279,7 +279,7 @@ else group_size = sizeof(struct ext2_group_desc); - printf("filesystem group size %d\n", group_size); + if (Debug) printf("filesystem group size %d\n", group_size); gds = (struct ext2_group_desc *)malloc(ngroups * group_size); diff -Nru palo-2.12/ipl/ipl.c palo-2.14/ipl/ipl.c --- palo-2.12/ipl/ipl.c 2019-09-07 13:04:22.000000000 +0000 +++ palo-2.14/ipl/ipl.c 2020-05-30 22:00:08.000000000 +0000 @@ -822,9 +822,9 @@ /* could theoretically use a function pointer, but they're ugly on PA */ if(pdc_default_width(wide)) goto restart; - printf("Branching to kernel entry point 0x%08x. If this is the last\n" - "message you see, you may need to switch your console. This is\n" - "a common symptom -- search the FAQ and mailing list at parisc-linux.org\n\n", + printf("Branching to kernel entry point 0x%08x. If this is the last message you\n" + "see, you may need to switch your console. This is a common symptom -- search\n" + "the FAQ and mailing list at https://parisc.wiki.kernel.org\n\n", entry); return entry; } diff -Nru palo-2.12/ipl/Makefile palo-2.14/ipl/Makefile --- palo-2.12/ipl/Makefile 2018-01-04 10:20:18.000000000 +0000 +++ palo-2.14/ipl/Makefile 2020-05-30 22:00:08.000000000 +0000 @@ -30,16 +30,16 @@ LD = ${CROSS_COMPILE}ld ifneq ("$(wildcard /etc/debian_version)","") -BLDINFO := $(shell echo http://www.parisc-linux.org - `dpkg-parsechangelog -l../debian/changelog -SDate`) +BLDINFO := $(shell echo https://parisc.wiki.kernel.org - `dpkg-parsechangelog -l../debian/changelog -SDate`) else -BLDINFO := $(shell echo http://www.parisc-linux.org - `LC_TIME=C date`) +BLDINFO := $(shell echo https://parisc.wiki.kernel.org - `LC_TIME=C date`) endif # Source sharing with palo VPATH=../lib:. AFLAGS = -I../lib -CFLAGS = -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks +CFLAGS = -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks -fno-builtin LDFLAGS = -N --section-start .init=0x60000 -e '$$START$$' all: iplelf Binary files /tmp/tmp6Xhb42/g5L5rw2_GL/palo-2.12/iplboot and /tmp/tmp6Xhb42/ZTnG0IqPqP/palo-2.14/iplboot differ diff -Nru palo-2.12/lib/common.h palo-2.14/lib/common.h --- palo-2.12/lib/common.h 2019-09-07 13:04:22.000000000 +0000 +++ palo-2.14/lib/common.h 2020-05-30 22:00:08.000000000 +0000 @@ -9,7 +9,7 @@ */ #define PALOMAGIC "PALO" -#define PALOVERSION "2.12" +#define PALOVERSION "2.14" #ifndef __ASSEMBLY__ diff -Nru palo-2.12/Makefile palo-2.14/Makefile --- palo-2.12/Makefile 2019-09-07 13:04:22.000000000 +0000 +++ palo-2.14/Makefile 2020-05-30 22:00:08.000000000 +0000 @@ -107,8 +107,10 @@ cd palo && $(MAKE) distclean ifdef HELP2MAN -palo.8: palo/palo palo/usage.txt palo.help2man - help2man --no-info -i palo.help2man ./palo/palo > palo.8 +palo.8: makepalo palo/usage.txt palo.help2man + help2man --section=8 --no-info \ + --name="boot media management tool for PA-RISC/HPPA." \ + --include=palo.help2man ./palo/palo > palo.8 endif palo.8.gz: palo.8 diff -Nru palo-2.12/palo/Makefile palo-2.14/palo/Makefile --- palo-2.12/palo/Makefile 2018-01-04 10:20:18.000000000 +0000 +++ palo-2.14/palo/Makefile 2020-05-30 22:00:08.000000000 +0000 @@ -16,9 +16,9 @@ endif ifneq ("$(wildcard /etc/debian_version)","") -BLDINFO := $(shell echo http://www.parisc-linux.org - `dpkg-parsechangelog -l../debian/changelog -SDate`) +BLDINFO := $(shell echo https://parisc.wiki.kernel.org - `dpkg-parsechangelog -l../debian/changelog -SDate`) else -BLDINFO := $(shell echo http://www.parisc-linux.org - `LC_TIME=C date`) +BLDINFO := $(shell echo https://parisc.wiki.kernel.org - `LC_TIME=C date`) endif # LDFLAGS=-Wl,-Bstatic diff -Nru palo-2.12/palo/palo.c palo-2.14/palo/palo.c --- palo-2.12/palo/palo.c 2019-07-23 16:00:34.000000000 +0000 +++ palo-2.14/palo/palo.c 2020-05-30 22:00:08.000000000 +0000 @@ -744,7 +744,7 @@ char *bootloaderfile = "/usr/share/palo/iplboot"; int init = 0; extern const char bld_info[]; - const char gargs[] = "f:C:s:b:k:c:r:I:e:U:v?"; + const char gargs[] = "f:C:s:b:k:c:r:I:e:U:v?V"; char *config_file = "/etc/palo.conf"; char *newargv[MAXARGS]; int newargc, format_as = 0; @@ -757,7 +757,7 @@ assert((unsigned long)&f.ipl_addr - (unsigned long)&f == 0xf0); } - fputs("palo version " PALOVERSION "\n", stdout); + fputs("palo - boot media management tool for PA-RISC/HPPA.\n", stdout); /* do we have a -f? */ while ((c = GETOPT(argc, argv, gargs)) != EOF) @@ -771,6 +771,7 @@ error(0, argv[0]); break; case 'V': + fputs("palo version " PALOVERSION "\n", stdout); puts(bld_info); return 0; } diff -Nru palo-2.12/palo.8 palo-2.14/palo.8 --- palo-2.12/palo.8 2019-07-23 16:00:34.000000000 +0000 +++ palo-2.14/palo.8 2020-05-30 22:00:08.000000000 +0000 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH PALO "1" "July 2019" "palo version 2.01" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH PALO "8" "Mai 2020" "palo - boot media management tool for PA-RISC/HPPA." "System Administration Utilities" .SH NAME -palo \- manual page for palo version 2.01 +palo \- boot media management tool for PA-RISC/HPPA. .SH SYNOPSIS .B palo [\fI\,options\/\fR] .SH DESCRIPTION -palo version 2.01 +palo \- boot media management tool for PA\-RISC/HPPA. .TP \-?, \fB\-\-help\fR Print this information @@ -93,7 +93,8 @@ When more than one of \fB\-I\fR, \fB\-U\fR, \fB\-s\fR and \fB\-C\fR are used, only the last one is effective. .PP -http://www.parisc\-linux.org \- Wed, 17 Jan 2018 15:15:40 +0100 +palo version 2.14 +https://parisc.wiki.kernel.org \- Sat May 30 23:29:03 CEST 2020 palo is the installation and management tool for the parisc bootloader, called iplboot. The size required for the iplboot binary diff -Nru palo-2.12/palo.spec palo-2.14/palo.spec --- palo-2.12/palo.spec 2019-09-07 13:04:22.000000000 +0000 +++ palo-2.14/palo.spec 2020-05-30 22:00:08.000000000 +0000 @@ -1,5 +1,5 @@ Name: palo -Version: 2.12 +Version: 2.14 Release: 1%{?dist} Summary: PALO - PA-RISC Boot Loader Packager: Helge Deller @@ -13,6 +13,8 @@ %description PALO - Linux boot loader and boot media management tool for PA-RISC/HPPA. +%global debug_package %{nil} + %prep %setup -c