Compare commits

...

No commits in common. "c9-beta" and "c8" have entirely different histories.
c9-beta ... c8

8 changed files with 59 additions and 159 deletions

View File

@ -1 +1 @@
96753e136ba3c385b1145b0b65e0a21163437eab SOURCES/dialog-1.3-20210117.tgz
ee0b829be362ae531932f9d2719df177f7c13508 SOURCES/dialog-1.3-20171209.tgz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dialog-1.3-20210117.tgz
SOURCES/dialog-1.3-20171209.tgz

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCYATnyAAKCRBwI1Pg9+SO
23rDAKCLiE8HpUP14I5WUzzH/I66ZD0X5ACggSZpV+ZEvA6PXq+Dj4tTwob8QeM=
=HMEL
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,23 @@
diff -up dialog-1.1-20110707/dialog-config.in.incdir dialog-1.1-20110707/dialog-config.in
--- dialog-1.1-20110707/dialog-config.in.incdir 2011-01-06 10:38:03.000000000 +0100
+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:00:02.692038027 +0200
@@ -35,6 +35,7 @@ bindir="@bindir@"
libdir="@libdir@"
datadir="@datadir@"
mandir="@mandir@"
+includedir="@includedir@"
THIS="@PACKAGE@"
@@ -67,10 +68,7 @@ while test $# -gt 0; do
;;
# compile/link
--cflags)
- INCS=
- if test "${prefix}/include" != /usr/include ; then
- INCS="-I${prefix}/include"
- fi
+ INCS="-I$includedir"
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
ENDECHO

View File

@ -1,10 +1,10 @@
diff -up dialog-1.3-20200327/makefile.in.libs dialog-1.3-20200327/makefile.in
--- dialog-1.3-20200327/makefile.in.libs 2020-03-31 10:23:58.460871536 +0200
+++ dialog-1.3-20200327/makefile.in 2020-03-31 10:25:12.231861304 +0200
@@ -204,7 +204,7 @@ dialog$o \
diff -up dialog-1.3-20170131/makefile.in.libs dialog-1.3-20170131/makefile.in
--- dialog-1.3-20170131/makefile.in.libs 2017-02-01 13:24:22.300746602 +0100
+++ dialog-1.3-20170131/makefile.in 2017-02-01 13:25:22.200905261 +0100
@@ -203,7 +203,7 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(PROG) : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(CFLAGS) $(LDFLAGS)

View File

@ -1,46 +1,21 @@
diff -up dialog-1.3-20191110/dialog-config.in.multilib dialog-1.3-20191110/dialog-config.in
--- dialog-1.3-20191110/dialog-config.in.multilib 2019-09-26 02:50:46.000000000 +0200
+++ dialog-1.3-20191110/dialog-config.in 2019-11-11 13:05:01.327868746 +0100
@@ -53,14 +53,14 @@ while test $# -gt 0; do
diff -up dialog-1.2-20121230/dialog-config.in.multilib dialog-1.2-20121230/dialog-config.in
--- dialog-1.2-20121230/dialog-config.in.multilib 2013-03-18 15:43:10.639021412 +0100
+++ dialog-1.2-20121230/dialog-config.in 2013-03-18 15:44:08.519065774 +0100
@@ -33,7 +33,7 @@ exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
eval bindir='"@bindir@"'
eval includedir='"@includedir@"'
- eval libdir='"@libdir@"'
+ eval libdir=''
eval datadir='"@datadir@"'
eval mandir='"@mandir@"'
[ -z "$includedir" ] && includedir="${prefix}/include"
- eval LDFLAGS='"@LDFLAGS@"'
- eval LIBS='"@LIBS@"'
+ eval LDFLAGS=''
+ eval LIBS=''
LIBS="-l${THIS} $LIBS"
# If the directory given by --libdir is not in the LDFLAGS+LIBS set,
@@ -74,12 +74,12 @@ while test $# -gt 0; do
break
fi
done
- if [ $found = no ]
+ if false
then
[ -n "$LFLAGS" ] && LDFLAGS=" $LFDLAGS"
LDFLAGS="-L${libdir}$LDFLAGS"
fi
- [ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
+ #[ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
# Ignore -L options which do not correspond to an actual directory,
# or which are standard library directories (i.e., the linker is
@@ -94,9 +94,6 @@ while test $# -gt 0; do
-L*)
[ -d ${opt##-L} ] || continue
case ${opt##-L} in
- @LD_SEARCHPATH@) # skip standard libdir
- continue
- ;;
*)
;;
esac
bindir="@bindir@"
-libdir="@libdir@"
+libdir=
datadir="@datadir@"
mandir="@mandir@"
includedir="@includedir@"
@@ -76,7 +76,7 @@ ENDECHO
;;
--libs)
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- -L${exec_prefix}/lib -l${THIS} @LIBS@
+ -l${THIS}
ENDECHO
;;
# identification

View File

@ -1,32 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.12 (GNU/Linux)
mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4
4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN
WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg
EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb
8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe
OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb
oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE
+bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx
nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp
Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PokBIgQQAQIADAUCTZ7Q
ZQUDABJ1AAAKCRCXELibyletfLKrB/sEVLsrCjFTwevbgKSzgCwLf6EhkifktlFB
w7/4n9Do1n7/LpgjdMH06YD9RjfSap4tdvEiHpzkpUtCGuzkGc/u4qTMdnWNgFhh
oHLhjVh4u72B/NtlgrpDEDrn1bnuZpzWxru4uDJGSgL00jV5b3kf1P07eQaguMC6
VeuzFmukv8LiDFhZcCl492nMZxz7vSRgSi8Ce+/Oc4Q+XTWmF5ZMKd5xNLjBdj2P
zOABHmDP1aA75grY30vVViPJve+W0h7A3PP9GuugNDkqmdCvTxYeMqiF6Vtv19/N
EW4jIvmN7GLOBo5F4RYcE9Fv4lV0xXlfpYwCqY7iAx9jyXgCbKXxiF4EExECAB4F
Aj/4r7ICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQcCNT4Pfkjtt6MQCeKZHo
SgACIQk95rWefzSLULcpjxoAnjVet8e1/1indwT/wDDnObDDfM2UiEYEExECAAYF
AlZ3yw8ACgkQXd+Pt2iOMaZ0bACfVCFh+GzDCNXmZ3RcmDKjJxW7v4YAn0ApCgiS
8tZC2X2ZOs84WwJBIF7vuQENBD/4r7QQBACNOXUR5S3kRSry2IYGr4q0WjdPEh0k
oG1UVDhu0RN0Xbd2RnWjXrjYaYXskmCfo8pRwkNSUeFQ7ggRykcAECJTgfB6haHz
JP/JoD0BepEpwmkxDlsQaiigcEiDRSHxqEbpDVwfOCwY5o4r1jMVK9IhFevIyWuH
WghPO/ASRdF85wADBwP+JFo20ZhpLTkXBppW+bQR7GGHDYnNJpE/o9jev8EaaA9U
b1ST2G6T5iT+l1b09rcpGPfsA0ray9/AfH0DTvsxr0ai6ln+uM/TVY7S6vy3MLsq
yoJ6n2bfcr2R0B4lnRR34DCycATL9DVdmKf+NRTkvWXOSjTXQtdj0Kp2uYJeFqqI
SQQYEQIACQUCP/ivtAIbDAAKCRBwI1Pg9+SO266eAKDZ6zjUkRhpqsJxP6AWnIzR
YKoBTwCfcvSmQ7jC1nxJ6OkdrtZJH0znjF0=
=0vnF
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,15 +1,14 @@
Summary: A utility for creating TTY dialog boxes
Name: dialog
%global dialogsubversion 20210117
%global dialogsubversion 20171209
Version: 1.3
Release: 32.%{dialogsubversion}%{?dist}
Release: 13.%{dialogsubversion}%{?dist}
License: LGPLv2
Group: Applications/System
URL: https://invisible-island.net/dialog/dialog.html
Source0: https://invisible-mirror.net/archives/dialog/dialog-%{version}-%{dialogsubversion}.tgz
Source1: https://invisible-mirror.net/archives/dialog/dialog-%{version}-%{dialogsubversion}.tgz.asc
Source2: https://invisible-island.net/public/dickey-invisible-island.txt
BuildRequires: ncurses-devel gcc gettext findutils libtool gnupg2
BuildRequires: make
Source: ftp://ftp.invisible-island.net/dialog/dialog-%{version}-%{dialogsubversion}.tgz
BuildRequires: ncurses-devel gcc gettext findutils libtool
Patch1: dialog-incdir.patch
Patch2: dialog-multilib.patch
Patch3: dialog-libs.patch
@ -24,6 +23,7 @@ Install dialog if you would like to create TTY dialog boxes.
%package devel
Summary: Development files for building applications with the dialog library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} ncurses-devel
%description devel
@ -33,8 +33,8 @@ contains the files needed for developing applications, which use the
dialog library.
%prep
%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}
%setup -q -n dialog-%{version}-%{dialogsubversion}
%patch1 -p1 -b .incdir
%patch2 -p1 -b .multilib
%patch3 -p1 -b .libs
@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libdialog.{,l}a
%files -f %{name}.lang
%doc COPYING dialog.lsm README _samples/samples
%{_bindir}/dialog
%{_libdir}/libdialog.so.15*
%{_libdir}/libdialog.so.14*
%{_mandir}/man1/dialog.*
%files devel
@ -78,65 +78,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libdialog.{,l}a
%{_mandir}/man3/dialog.*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3-32.20210117
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.3-31.20210117
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-30.20210117
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 18 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-29.20210117
- update to 1.3-20210117
* Fri Nov 27 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-28.20201126
- update to 1.3-20201126
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-27.20200327
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 31 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-26.20200327
- update to 1.3-20200327
* Mon Mar 09 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-25.20200228
- update to 1.3-20200228
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-24.20191210
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Dec 11 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-23.20191210
- update to 1.3-20191210
* Mon Nov 11 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-22.20191110
- update to 1.3-20191110
* Mon Aug 12 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-21.20190808
- update to 1.3-20190808
* Wed Aug 07 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-20.20190806
- update to 1.3-20190806
- verify upstream signatures
* Mon Jul 29 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-19.20190728
- update to 1.3-20190728
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-18.20190211
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 20 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-17.20190211
- update to 1.3-20190211
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-16.20180621
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-15.20180621
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 22 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-14.20180621
- update to 1.3-20180621
* Thu Mar 29 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.3-13.20171209
- update to 1.3-20171209
- fix build with multiple options in hardened ldflags (#1548400)