From 180e6ccb0b26e4ddf9d24ae67eb73c88d36e26f5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:39 +0000 Subject: [PATCH 01/84] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 19cd451..ea7d2a7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alpine -# $Id$ +# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $ NAME := alpine SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4efc6eeaac2c9cec8ae211ed15a62e5aa761af76 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:42:38 +0000 Subject: [PATCH 02/84] Initialize branch EL-6 for alpine --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 18178667d22540e1711c1e0af6eb586aaba25eb9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Jul 2010 16:13:56 +0000 Subject: [PATCH 03/84] revert rebuild commits --- alpine.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/alpine.spec b/alpine.spec index 215ea60..ce7f00c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 8%{?dist} +Release: 6%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -127,12 +127,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Aug 21 2009 Tomas Mraz - 2.00-8 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 2.00-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - * Thu Jul 02 2009 Caolán McNamara - 2.00-6 - --with-spellcheck-prog isn't a configure option use --with-simple-spellcheck/--with-interactive-spellcheck and patch From 849598f2d408269f51540115843f5ad0556c332e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Jul 2010 16:44:16 +0000 Subject: [PATCH 04/84] Remove some largely-unecessary BR's, esp path-based ones (should help make skvidal happier) Mon Jul 19 2010 Rex Dieter - 2.00-9 - --with-npa=/usr/bin/inews - --with-smtp-msa=/usr/sbin/sendmail --- alpine.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/alpine.spec b/alpine.spec index 215ea60..f30bc44 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 8%{?dist} +Release: 9%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -34,14 +34,16 @@ Patch2: alpine-2.00-hunspell.patch BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell -BuildRequires: inews +## passing --with-npa=/usr/bin/inews +#BuildRequires: inews BuildRequires: krb5-devel BuildRequires: ncurses-devel BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: passwd -BuildRequires: sendmail /usr/sbin/sendmail +# passing --with-smtp-msa=/usr/sbin/sendmail instead +#BuildRequires: /usr/sbin/sendmail Requires: hunspell Requires: mailcap @@ -69,9 +71,7 @@ GNU Build System's autotools. %prep %setup -q -#if 0%{?fedora} > 10 %patch1 -p1 -b .gcc44_reply_hack -#endif %patch2 -p1 -b .hunspell # HACK to workaround local auto* wierdness outside of mock @@ -86,6 +86,8 @@ touch imap/ip6 --enable-debug=no \ --without-tcl \ --with-c-client-target=lfd \ + --with-smtp-msa=/usr/sbin/sendmail \ + --with-npa=/usr/bin/inews \ --with-passfile=.alpine.passfile \ --with-simple-spellcheck=hunspell \ --with-interactive-spellcheck=hunspell \ @@ -127,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 19 2010 Rex Dieter - 2.00-9 +- --with-npa=/usr/bin/inews +- --with-smtp-msa=/usr/sbin/sendmail + * Fri Aug 21 2009 Tomas Mraz - 2.00-8 - rebuilt with new openssl From 05454145304f51297da4cff6e7b20ecdd7a01f36 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Jul 2010 16:51:30 +0000 Subject: [PATCH 05/84] - --with-npa=/usr/bin/inews - --with-smtp-msa=/usr/sbin/sendmail --- alpine.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/alpine.spec b/alpine.spec index ce7f00c..f30bc44 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.00 -Release: 6%{?dist} +Release: 9%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -34,14 +34,16 @@ Patch2: alpine-2.00-hunspell.patch BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell -BuildRequires: inews +## passing --with-npa=/usr/bin/inews +#BuildRequires: inews BuildRequires: krb5-devel BuildRequires: ncurses-devel BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: passwd -BuildRequires: sendmail /usr/sbin/sendmail +# passing --with-smtp-msa=/usr/sbin/sendmail instead +#BuildRequires: /usr/sbin/sendmail Requires: hunspell Requires: mailcap @@ -69,9 +71,7 @@ GNU Build System's autotools. %prep %setup -q -#if 0%{?fedora} > 10 %patch1 -p1 -b .gcc44_reply_hack -#endif %patch2 -p1 -b .hunspell # HACK to workaround local auto* wierdness outside of mock @@ -86,6 +86,8 @@ touch imap/ip6 --enable-debug=no \ --without-tcl \ --with-c-client-target=lfd \ + --with-smtp-msa=/usr/sbin/sendmail \ + --with-npa=/usr/bin/inews \ --with-passfile=.alpine.passfile \ --with-simple-spellcheck=hunspell \ --with-interactive-spellcheck=hunspell \ @@ -127,6 +129,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 19 2010 Rex Dieter - 2.00-9 +- --with-npa=/usr/bin/inews +- --with-smtp-msa=/usr/sbin/sendmail + +* Fri Aug 21 2009 Tomas Mraz - 2.00-8 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 2.00-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jul 02 2009 Caolán McNamara - 2.00-6 - --with-spellcheck-prog isn't a configure option use --with-simple-spellcheck/--with-interactive-spellcheck and patch From 38885df07a28e5cf246d1be16a44d72971dda8ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:44:21 +0000 Subject: [PATCH 06/84] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ea7d2a7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alpine -# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $ -NAME := alpine -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From af9fc8f53cef2eb72d6d0bd796e163db0c64f7a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:44:24 +0000 Subject: [PATCH 07/84] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ea7d2a7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alpine -# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $ -NAME := alpine -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From a150d08361d06925c397e64e1f2508ad683a8fc6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Oct 2010 14:51:19 -0500 Subject: [PATCH 08/84] - re-alpine-2.02 (#465341) --- .gitignore | 1 + alpine-2.00-hunspell.patch | 104 ----------------------------------- alpine.spec | 30 +++++----- re-alpine-2.02-openssl.patch | 12 ++++ sources | 2 +- 5 files changed, 31 insertions(+), 118 deletions(-) delete mode 100644 alpine-2.00-hunspell.patch create mode 100644 re-alpine-2.02-openssl.patch diff --git a/.gitignore b/.gitignore index 71a0b76..f4a010a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ alpine-2.00.tar.bz2 +/re-alpine-2.02.tar.bz2 diff --git a/alpine-2.00-hunspell.patch b/alpine-2.00-hunspell.patch deleted file mode 100644 index 1568bec..0000000 --- a/alpine-2.00-hunspell.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -ru alpine-2.00.orig/configure.ac alpine-2.00/configure.ac ---- alpine-2.00.orig/configure.ac 2009-06-28 16:52:14.000000000 +0100 -+++ alpine-2.00/configure.ac 2009-07-02 15:22:43.000000000 +0100 -@@ -361,29 +361,36 @@ - fi - ], - [ -- SPELLPROG=yes -+ AC_CHECK_PROG([SPELLPROG], [hunspell], [hunspell], []) -+ if test -z "$SPELLPROG" ; then -+ AC_CHECK_PROG([SPELLPROG], [aspell], [aspell], []) -+ if test -z "$SPELLPROG" ; then -+ AC_CHECK_PROG([SPELLPROG], [ispell], [ispell], []) -+ if test -z "$SPELLPROG" ; then -+ SPELLPROG="spell" -+ fi -+ fi -+ fi - ]) - --case "$SPELLPROG" in -- no) -- ;; -- yes) -- AC_PATH_PROG(alpine_simple_spellcheck, [aspell]) -- if test -n "$alpine_simple_spellcheck" ; then -- alpine_simple_spellcheck="$alpine_simple_spellcheck --dont-backup --mode=email list" -- else -- AC_PATH_PROG(alpine_simple_spellcheck, [ispell]) -- if test -n "$alpine_simple_spellcheck" ; then -+if test "x$SPELLPROG" != "xno" ; then -+ AC_PATH_PROG(alpine_simple_spellcheck, $SPELLPROG) -+ if test -n "$alpine_simple_spellcheck" ; then -+ case "$SPELLPROG" in -+ hunspell) - alpine_simple_spellcheck="$alpine_simple_spellcheck -l" -- else -- AC_PATH_PROG(alpine_simple_spellcheck, [spell]) -- fi -- fi -- ;; -- *) -- AC_PATH_PROG(alpine_simple_spellcheck, $SPELLPROG) -- ;; --esac -+ ;; -+ aspell) -+ alpine_simple_spellcheck="$alpine_simple_spellcheck --dont-backup --mode=email list" -+ ;; -+ ispell) -+ alpine_simple_spellcheck="$alpine_simple_spellcheck -l" -+ ;; -+ *) -+ ;; -+ esac -+ fi -+fi - - dnl OPTION: interactive spell checking program - AC_ARG_WITH(interactive-spellcheck, -@@ -394,24 +401,27 @@ - fi - ], - [ -- ISPELLPROG=yes -+ AC_CHECK_PROG([ISPELLPROG], [hunspell], [hunspell], []) -+ if test -z "$ISPELLPROG" ; then -+ AC_CHECK_PROG([ISPELLPROG], [aspell], [aspell], []) -+ if test -z "$SPELLPROG" ; then -+ ISPELLPROG="ispell" -+ fi -+ fi - ]) - --case "$ISPELLPROG" in -- no) -- ;; -- yes) -- AC_PATH_PROG(alpine_interactive_spellcheck, [aspell]) -- if test -n "$alpine_interactive_spellcheck" ; then -- alpine_interactive_spellcheck="$alpine_interactive_spellcheck --dont-backup --mode=email check" -- else -- AC_PATH_PROG(alpine_interactive_spellcheck, [ispell]) -- fi -- ;; -- *) -- AC_PATH_PROG(alpine_interactive_spellcheck, $withval) -- ;; --esac -+if test "x$ISPELLPROG" != "xno" ; then -+ AC_PATH_PROG(alpine_interactive_spellcheck, $ISPELLPROG) -+ if test -n "$alpine_interactive_spellcheck" ; then -+ case "$ISPELLPROG" in -+ aspell) -+ alpine_interactive_spellcheck="$alpine_interactive_spellcheck --dont-backup --mode=email check" -+ ;; -+ *) -+ ;; -+ esac -+ fi -+fi - - if test -z "$alpine_simple_spellcheck" -a -n "$alpine_interactive_spellcheck" ; then - alpine_simple_spellcheck=test diff --git a/alpine.spec b/alpine.spec index f30bc44..e05560d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,15 +2,13 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.00 -Release: 9%{?dist} +Version: 2.02 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet -URL: http://www.washington.edu/alpine -# FTP: ftp://ftp.cac.washington.edu/alpine/ -# SVN: https://svn.cac.washington.edu/public/alpine/snapshots/ -Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 +URL: http://re-alpine.sourceforge.net/ +Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -26,12 +24,17 @@ Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Provides: re-alpine = %{version}-%{release} + # short-term workaround until gcc is fixed # http://bugzilla.redhat.com/496400 Patch1: alpine-2.00-gcc44_reply_hack.patch -Patch2: alpine-2.00-hunspell.patch -BuildRequires: automake libtool +## upstreamable patches +# this one maybe already, recall grumblings onlinst awhile back -- Rex +Patch50: re-alpine-2.02-openssl.patch + +#BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell ## passing --with-npa=/usr/bin/inews @@ -69,14 +72,12 @@ GNU Build System's autotools. %prep -%setup -q +%setup -q -n re-alpine-%{version} %patch1 -p1 -b .gcc44_reply_hack -%patch2 -p1 -b .hunspell +%patch50 -p1 -b .openssl -# HACK to workaround local auto* wierdness outside of mock -export AUTOPOINT=/bin/true -autoreconf -f -i +#autoreconf -f -i %build @@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 08 2010 Rex Dieter - 2.02-1 +- re-alpine-2.02 (#465341) + * Mon Jul 19 2010 Rex Dieter - 2.00-9 - --with-npa=/usr/bin/inews - --with-smtp-msa=/usr/sbin/sendmail diff --git a/re-alpine-2.02-openssl.patch b/re-alpine-2.02-openssl.patch new file mode 100644 index 0000000..98e8d31 --- /dev/null +++ b/re-alpine-2.02-openssl.patch @@ -0,0 +1,12 @@ +diff -up re-alpine-2.02/pith/smkeys.c.openssl re-alpine-2.02/pith/smkeys.c +--- re-alpine-2.02/pith/smkeys.c.openssl 2010-10-02 03:37:57.000000000 -0500 ++++ re-alpine-2.02/pith/smkeys.c 2010-10-08 14:44:57.068382616 -0500 +@@ -277,7 +277,7 @@ char * + get_x509_subject_email(X509 *x) + { + char *result = NULL; +-#if OPENSSL_VERSION_NUMBER >= 0x1000000f /* OpenSSL 1.0.0 */ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L /* OpenSSL 1.0.0 */ + STACK_OF(OPENSSL_STRING) *emails; + #else /* OpenSSL 0.x and 1.0.0-dev/beta */ + STACK *emails; diff --git a/sources b/sources index b4072d9..8d6ff1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84e44cbf71ed674800a5d57eed9c1c52 alpine-2.00.tar.bz2 +5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 From fb48f113554ed2b7e530ad32bc7c66a54276a3e8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:56:45 -0600 Subject: [PATCH 09/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index e05560d..f7778cf 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.02 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Oct 08 2010 Rex Dieter - 2.02-1 - re-alpine-2.02 (#465341) From b0d3d352b9df49afea2da1f7b417b9b6e7f764cd Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Wed, 28 Dec 2011 20:51:04 -0800 Subject: [PATCH 10/84] Update to 2.02 --- .gitignore | 3 +++ alpine.spec | 46 ++++++++++++++++++++++++++++------------------ sources | 4 +++- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 71a0b76..dcdc41a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ alpine-2.00.tar.bz2 +/re-alpine-2.02.tar.bz2 +/re-alpine-2.02-openssl.patch +/README.fedora diff --git a/alpine.spec b/alpine.spec index f30bc44..a6f1551 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,15 +2,14 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.00 -Release: 9%{?dist} +Version: 2.02 +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet -URL: http://www.washington.edu/alpine -# FTP: ftp://ftp.cac.washington.edu/alpine/ -# SVN: https://svn.cac.washington.edu/public/alpine/snapshots/ -Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 +URL: http://re-alpine.sourceforge.net/ +Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 +Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -26,12 +25,13 @@ Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# short-term workaround until gcc is fixed -# http://bugzilla.redhat.com/496400 -Patch1: alpine-2.00-gcc44_reply_hack.patch -Patch2: alpine-2.00-hunspell.patch +Provides: re-alpine = %{version}-%{release} -BuildRequires: automake libtool +## upstreamed patch: hopefully fix ftbfs openssl issues once and for all (sf bug #3027341) +# this one maybe already, recall grumblings onlinst awhile back -- Rex +Patch50: re-alpine-2.02-openssl.patch + +#BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell ## passing --with-npa=/usr/bin/inews @@ -69,14 +69,13 @@ GNU Build System's autotools. %prep -%setup -q +%setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch2 -p1 -b .hunspell +cp -p %{SOURCE1} . -# HACK to workaround local auto* wierdness outside of mock -export AUTOPOINT=/bin/true -autoreconf -f -i +%patch50 -p1 -b .openssl + +#autoreconf -f -i %build @@ -113,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README.fedora README LICENSE doc/tech-notes.txt %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -129,6 +128,17 @@ rm -rf $RPM_BUILD_ROOT %changelog + +* Wed Dec 28 2011 Joshua Daniel Franklin 2.02-3 +- Add README.fedora (#427561) +- Remove short-term gcc workaround (#496400) + +* Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 08 2010 Rex Dieter - 2.02-1 +- re-alpine-2.02 (#465341) + * Mon Jul 19 2010 Rex Dieter - 2.00-9 - --with-npa=/usr/bin/inews - --with-smtp-msa=/usr/sbin/sendmail diff --git a/sources b/sources index b4072d9..a68222d 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -84e44cbf71ed674800a5d57eed9c1c52 alpine-2.00.tar.bz2 +5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +429c1862495acb23bb10879d4db04f91 re-alpine-2.02-openssl.patch +5b6f93ec7414c2a794480691a3beae24 README.fedora From d4e1139bfe49d324aa1f76ce3436146241cf33ba Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:11:02 -0600 Subject: [PATCH 11/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index f7778cf..78bec88 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.02 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 9b850c9713ed6ecb26a46d4efe521c689126ff34 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:50:56 -0500 Subject: [PATCH 12/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 78bec88..4225f76 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.02 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 055592e3bafa1f5eaf8c58eb5c32395aae05e544 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:25:50 -0500 Subject: [PATCH 13/84] Update to upstream release 2.03 --- .gitignore | 1 + alpine.spec | 18 +++++------------- sources | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f4a010a..d2ef6e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 +/re-alpine-2.03.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 4225f76..f939789 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.02 -Release: 4%{?dist} +Version: 2.03 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -26,14 +26,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: re-alpine = %{version}-%{release} -# short-term workaround until gcc is fixed -# http://bugzilla.redhat.com/496400 -Patch1: alpine-2.00-gcc44_reply_hack.patch - -## upstreamable patches -# this one maybe already, recall grumblings onlinst awhile back -- Rex -Patch50: re-alpine-2.02-openssl.patch - #BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell @@ -74,9 +66,6 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch50 -p1 -b .openssl - #autoreconf -f -i @@ -130,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + * Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 8d6ff1a..2703c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From 96565eab525f9811ee2df217205d97ffc270bbf3 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:48:41 -0500 Subject: [PATCH 14/84] Add README.fedora --- .gitignore | 1 + alpine.spec | 9 +++++++-- sources | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2ef6e0..0baf649 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /re-alpine-2.03.tar.bz2 +/README.fedora diff --git a/alpine.spec b/alpine.spec index f939789..9f90915 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,12 +3,14 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.03 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://re-alpine.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 +Source1: README.fedora + # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -103,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README.fedora README LICENSE doc/tech-notes.txt %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 +- add README.fedora + * Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 - re-alpine-2.03 (#880328,#888204) diff --git a/sources b/sources index 2703c80..b5c5f32 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +5b6f93ec7414c2a794480691a3beae24 README.fedora 566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From a6f71ef03b52ba721bbdb8738737b33a85bc5336 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Thu, 20 Dec 2012 23:50:19 -0500 Subject: [PATCH 15/84] Add README.fedora --- .gitignore | 1 + alpine.spec | 26 +++++++++++++------------- sources | 3 +-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index dcdc41a..f7c2477 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /re-alpine-2.02-openssl.patch /README.fedora +/re-alpine-2.03.tar.bz2 diff --git a/alpine.spec b/alpine.spec index a6f1551..9f90915 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.02 -Release: 3%{?dist} +Version: 2.03 +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -11,6 +11,7 @@ URL: http://re-alpine.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 Source1: README.fedora + # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user # functionality such as non-ASCII encoded saved passwords. Additionally, there @@ -27,10 +28,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: re-alpine = %{version}-%{release} -## upstreamed patch: hopefully fix ftbfs openssl issues once and for all (sf bug #3027341) -# this one maybe already, recall grumblings onlinst awhile back -- Rex -Patch50: re-alpine-2.02-openssl.patch - #BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell @@ -71,10 +68,6 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} -cp -p %{SOURCE1} . - -%patch50 -p1 -b .openssl - #autoreconf -f -i @@ -128,10 +121,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 +- add README.fedora -* Wed Dec 28 2011 Joshua Daniel Franklin 2.02-3 -- Add README.fedora (#427561) -- Remove short-term gcc workaround (#496400) +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + +* Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a68222d..b5c5f32 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 -429c1862495acb23bb10879d4db04f91 re-alpine-2.02-openssl.patch 5b6f93ec7414c2a794480691a3beae24 README.fedora +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From 0f2052eae54a882dbf133a4d62158b2ce632a06c Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 21 Dec 2012 00:36:18 -0500 Subject: [PATCH 16/84] Add README.fedora --- alpine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alpine.spec b/alpine.spec index 9f90915..fd7ebbe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -68,6 +68,8 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} +cp -p %{SOURCE1} . + #autoreconf -f -i From 238d1532cc67e15f80e586334a38c5d6f56d1d6f Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 21 Dec 2012 00:37:11 -0500 Subject: [PATCH 17/84] Add README.fedora --- alpine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alpine.spec b/alpine.spec index 9f90915..fd7ebbe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -68,6 +68,8 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} +cp -p %{SOURCE1} . + #autoreconf -f -i From 78f8a1a366b54acf09cd0bcc82376c9db0cdaf6c Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 21 Dec 2012 00:38:43 -0500 Subject: [PATCH 18/84] Add README.fedora --- .gitignore | 2 ++ alpine.spec | 25 ++++++++++++------------- sources | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f4a010a..fb9b4d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 +/README.fedora +/re-alpine-2.03.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 4225f76..fd7ebbe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,13 +2,15 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.02 -Release: 4%{?dist} +Version: 2.03 +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://re-alpine.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 +Source1: README.fedora + # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -26,14 +28,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: re-alpine = %{version}-%{release} -# short-term workaround until gcc is fixed -# http://bugzilla.redhat.com/496400 -Patch1: alpine-2.00-gcc44_reply_hack.patch - -## upstreamable patches -# this one maybe already, recall grumblings onlinst awhile back -- Rex -Patch50: re-alpine-2.02-openssl.patch - #BuildRequires: automake libtool BuildRequires: gettext BuildRequires: hunspell @@ -74,8 +68,7 @@ GNU Build System's autotools. %prep %setup -q -n re-alpine-%{version} -%patch1 -p1 -b .gcc44_reply_hack -%patch50 -p1 -b .openssl +cp -p %{SOURCE1} . #autoreconf -f -i @@ -114,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README.fedora README LICENSE doc/tech-notes.txt %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -130,6 +123,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 +- add README.fedora + +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + * Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 8d6ff1a..b5c5f32 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -5e75826b15f05674856be8618bdefdfb re-alpine-2.02.tar.bz2 +5b6f93ec7414c2a794480691a3beae24 README.fedora +566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 From 011d113379a31c79c6bda76ba6d4df628c60d08d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:28:14 -0600 Subject: [PATCH 19/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index fd7ebbe..24bffda 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.03 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.03-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 - add README.fedora From 36c5620871ebb6bd2e250e6c44688cd584f9db80 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 8 Jul 2013 14:06:44 -0400 Subject: [PATCH 20/84] fix dates which caused mock builds to fail --- alpine.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine.spec b/alpine.spec index 24bffda..e3fd00a 100644 --- a/alpine.spec +++ b/alpine.spec @@ -192,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Feb 19 2008 Fedora Release Engineering - 1.00-3 - Autorebuild for GCC 4.3 -* Fri Dec 22 2007 Rex Dieter 1.00-2 +* Sat Dec 22 2007 Rex Dieter 1.00-2 - --with-system-pinerc=%%_sysconfdir/pine.conf --with-system-fixed-pinerc=%%_sysconfdir/pine.conf.fixed (#426512) @@ -205,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Nov 15 2007 Joshua Daniel Franklin 0.99999-3 - BuildRequires aspell to make configure happy -* Thu Nov 09 2007 Joshua Daniel Franklin 0.99999-2 +* Fri Nov 09 2007 Joshua Daniel Franklin 0.99999-2 - update to latest * Thu Oct 25 2007 Rex Dieter 0.999-2.2 +* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.2 - remove problem cc5.sol file - integrate changes from Patrick "Jima" Laughton -* Mon Jul 24 2007 Joshua Daniel Franklin 0.999-2.1 +* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.1 - correct spec syntax, explain Conflicts tag * Mon Jul 23 2007 Joshua Daniel Franklin 0.999-2.0 From 9b811e96d0e5c109a658ad28fa94416a84abb33b Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 8 Jul 2013 14:10:40 -0400 Subject: [PATCH 21/84] update to 2.10 - new upstream --- .gitignore | 1 + alpine.spec | 18 ++++++++++++------ sources | 3 +-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index fb9b4d9..be8af2a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /README.fedora /re-alpine-2.03.tar.bz2 +/alpine-2.10.clean.tar.lzma diff --git a/alpine.spec b/alpine.spec index 24bffda..f5e0beb 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,14 +2,17 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.03 -Release: 3%{?dist} +Version: 2.10 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet -URL: http://re-alpine.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 -Source1: README.fedora +# Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ +#URL: http://re-alpine.sourceforge.net/ +#Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 +URL: http://patches.freeiz.com/alpine/info/alpine.html +Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma +Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -66,7 +69,7 @@ GNU Build System's autotools. %prep -%setup -q -n re-alpine-%{version} +%setup -q -n alpine-%{version} cp -p %{SOURCE1} . @@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 15 2013 Paul Wouters - 2.10-1 +- Build from new upstream for 2.10, fixes rhbz#838359 + * Wed Feb 13 2013 Fedora Release Engineering - 2.03-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index b5c5f32..b63ba62 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -5b6f93ec7414c2a794480691a3beae24 README.fedora -566d269d4bd43aba68f377110a6295d5 re-alpine-2.03.tar.bz2 +727a6eaa577857b98ea74fac6ea42a25 alpine-2.10.clean.tar.lzma From 7907d47c227e869ace93981ae17cbbf5fc1a3cb4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:37:52 -0500 Subject: [PATCH 22/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 742bcd5..e386b2b 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.10 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Mar 15 2013 Paul Wouters - 2.10-1 - Build from new upstream for 2.10, fixes rhbz#838359 From 1fb235947a17358644ce5df3095ed616121b8152 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 21:04:04 -0500 Subject: [PATCH 23/84] remove refrences to non existant README.fedora file --- alpine.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/alpine.spec b/alpine.spec index e386b2b..fd3852d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.10 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -12,7 +12,6 @@ Group: Applications/Internet #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 URL: http://patches.freeiz.com/alpine/info/alpine.html Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma -Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -71,8 +70,6 @@ GNU Build System's autotools. %prep %setup -q -n alpine-%{version} -cp -p %{SOURCE1} . - #autoreconf -f -i @@ -110,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README.fedora README LICENSE doc/tech-notes.txt +%doc README LICENSE doc/tech-notes.txt %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -126,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Dennis Gilmore - 2.10-3 +- remove refrences to non existant README.fedora file + * Sat Aug 03 2013 Fedora Release Engineering - 2.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d558ddefba9a384e9e59855e8b6acaeb2fe9f5fd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 Oct 2013 11:34:14 -0500 Subject: [PATCH 24/84] re-add README.fedora --- .gitignore | 1 - README.fedora | 30 ++++++++++++++++++++++++++++++ alpine.spec | 10 ++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 README.fedora diff --git a/.gitignore b/.gitignore index be8af2a..c32062f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 -/README.fedora /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..9b3c96c --- /dev/null +++ b/README.fedora @@ -0,0 +1,30 @@ + += mlock = +If you get a notice "[Folder vulnerable - directory /var/mail must have 1777 protection]", you may want install the uw-imap-utils package to get setgid mlock (BZ #427561) + + += maildir support = +I'd like to stay out of it... just search "Mark Crispin maildir" for the gory details. No open license maildir patch exists for alpine. As a workaround, you can install a localhost IMAP server such as dovecot or courier to serve maildir folders, and connect to localhost from alpine via IMAP. + + +An example pinerc line: + mymaildir {localhost/ssl/novalidate-cert/user=myusername}[], + +Example /etc/dovecot.conf with only IMAPS: + +auth_verbose = yes +verbose_ssl = yes +mail_location = maildir:~/Maildir +protocols = imaps +# put cert in /etc/pki/dovecot/certs +protocol imap { +} +auth default { +mechanisms = plain +passdb pam { +} +userdb passwd { +} +user = root +} + diff --git a/alpine.spec b/alpine.spec index fd3852d..e6d4cbd 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -12,7 +12,7 @@ Group: Applications/Internet #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 URL: http://patches.freeiz.com/alpine/info/alpine.html Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma - +Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -70,6 +70,8 @@ GNU Build System's autotools. %prep %setup -q -n alpine-%{version} +install -m644 -p %{SOURCE1} . + #autoreconf -f -i @@ -108,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE doc/tech-notes.txt +%doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 31 2013 Rex Dieter 2.10-4 +- re-add README.fedora + * Sat Aug 03 2013 Dennis Gilmore - 2.10-3 - remove refrences to non existant README.fedora file From d0f882c930014935f0cc0920344c02db0ee908ec Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 6 Nov 2013 12:20:52 -0600 Subject: [PATCH 25/84] alpine-2.11, drop old/unused patches --- .gitignore | 1 + alpine-2.00-gcc44_reply_hack.patch | 11 ----------- alpine.spec | 9 ++++++--- re-alpine-2.02-openssl.patch | 12 ------------ sources | 2 +- 5 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 alpine-2.00-gcc44_reply_hack.patch delete mode 100644 re-alpine-2.02-openssl.patch diff --git a/.gitignore b/.gitignore index c32062f..d0be0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.02.tar.bz2 /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma +/alpine-2.11.tar.xz diff --git a/alpine-2.00-gcc44_reply_hack.patch b/alpine-2.00-gcc44_reply_hack.patch deleted file mode 100644 index 9fc0f50..0000000 --- a/alpine-2.00-gcc44_reply_hack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up alpine-2.00/pith/reply.c.gcc44 alpine-2.00/pith/reply.c ---- alpine-2.00/pith/reply.c.gcc44 2008-06-03 14:27:23.000000000 -0500 -+++ alpine-2.00/pith/reply.c 2009-05-06 08:07:27.000000000 -0500 -@@ -357,6 +357,7 @@ set_role_from_msg(struct pine *ps, long - * reply_seed - fill in reply header - * - */ -+__attribute__((__optimize__(0))) - void - reply_seed(struct pine *ps, ENVELOPE *outgoing, ENVELOPE *env, - struct mail_address *saved_from, struct mail_address *saved_to, diff --git a/alpine.spec b/alpine.spec index e6d4cbd..58a74e8 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.10 -Release: 4%{?dist} +Version: 2.11 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -11,7 +11,7 @@ Group: Applications/Internet #URL: http://re-alpine.sourceforge.net/ #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 URL: http://patches.freeiz.com/alpine/info/alpine.html -Source0: http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-%{version}.clean.tar.lzma +Source0: http://patches.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 06 2013 Rex Dieter 2.11-1 +- alpine-2.11, drop old/unused patches + * Thu Oct 31 2013 Rex Dieter 2.10-4 - re-add README.fedora diff --git a/re-alpine-2.02-openssl.patch b/re-alpine-2.02-openssl.patch deleted file mode 100644 index 98e8d31..0000000 --- a/re-alpine-2.02-openssl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up re-alpine-2.02/pith/smkeys.c.openssl re-alpine-2.02/pith/smkeys.c ---- re-alpine-2.02/pith/smkeys.c.openssl 2010-10-02 03:37:57.000000000 -0500 -+++ re-alpine-2.02/pith/smkeys.c 2010-10-08 14:44:57.068382616 -0500 -@@ -277,7 +277,7 @@ char * - get_x509_subject_email(X509 *x) - { - char *result = NULL; --#if OPENSSL_VERSION_NUMBER >= 0x1000000f /* OpenSSL 1.0.0 */ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L /* OpenSSL 1.0.0 */ - STACK_OF(OPENSSL_STRING) *emails; - #else /* OpenSSL 0.x and 1.0.0-dev/beta */ - STACK *emails; diff --git a/sources b/sources index b63ba62..b93e6d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -727a6eaa577857b98ea74fac6ea42a25 alpine-2.10.clean.tar.lzma +522b582855fed048d3dea2c5fe1e23a4 alpine-2.11.tar.xz From 1cd92175a7c1a51003c61a8685b13b421ca2d7af Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:30:29 -0500 Subject: [PATCH 26/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 58a74e8..cf0ae57 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Nov 06 2013 Rex Dieter 2.11-1 - alpine-2.11, drop old/unused patches From f46bffcefb7e4253ec11c5e449b0a0174b6ef312 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:21:38 +0000 Subject: [PATCH 27/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index cf0ae57..7c19cf6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 385324cc98e5f769ded4d1934092b73679d042d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:48:33 +0000 Subject: [PATCH 28/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 7c19cf6..e38b57f 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.11 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3b0463a75d787dabb6af4a1c60569333dc7f1cdd Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Tue, 7 Jul 2015 00:43:02 +0000 Subject: [PATCH 29/84] Update to upstream alpine-2.20.tar.xz --- .gitignore | 1 + alpine.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d0be0ce..8f7d111 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alpine-2.00.tar.bz2 /re-alpine-2.03.tar.bz2 /alpine-2.10.clean.tar.lzma /alpine-2.11.tar.xz +/alpine-2.20.tar.xz diff --git a/alpine.spec b/alpine.spec index e38b57f..f599b5d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,8 +2,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.11 -Release: 4%{?dist} +Version: 2.20 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 +- Build from new upstream for 2.10, fixes rhbz#1092688 rhbz#1142890 + * Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index b93e6d2..937a499 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -522b582855fed048d3dea2c5fe1e23a4 alpine-2.11.tar.xz +043b67666af73b26f9627ad97e2aaf92 alpine-2.20.tar.xz From 7a1e2249d244453bc870e1b07d8c4568c294ff45 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Tue, 7 Jul 2015 00:53:27 +0000 Subject: [PATCH 30/84] Update to upstream alpine-2.20.tar.xz --- alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index f599b5d..3ad5b3d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt +%doc README LICENSE doc/tech-notes.txt/tech-notes.txt %doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed From dcf1c7d140134d6c00df2d9cabf7dd385e2d4286 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Tue, 7 Jul 2015 01:00:30 +0000 Subject: [PATCH 31/84] Update to upstream alpine-2.20.tar.xz --- alpine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 3ad5b3d..2b8134d 100644 --- a/alpine.spec +++ b/alpine.spec @@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE doc/tech-notes.txt/tech-notes.txt +%doc README LICENSE %doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed From fa5dc5b2e577ecaf03613726b77bd9f5ee44767d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Oct 2015 12:58:37 -0500 Subject: [PATCH 32/84] use patched alpine sources (#1270331,#1270183) --- README.fedora | 5 ----- alpine.spec | 7 +++++-- sources | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.fedora b/README.fedora index 9b3c96c..53d86c2 100644 --- a/README.fedora +++ b/README.fedora @@ -2,11 +2,6 @@ = mlock = If you get a notice "[Folder vulnerable - directory /var/mail must have 1777 protection]", you may want install the uw-imap-utils package to get setgid mlock (BZ #427561) - -= maildir support = -I'd like to stay out of it... just search "Mark Crispin maildir" for the gory details. No open license maildir patch exists for alpine. As a workaround, you can install a localhost IMAP server such as dovecot or courier to serve maildir folders, and connect to localhost from alpine via IMAP. - - An example pinerc line: mymaildir {localhost/ssl/novalidate-cert/user=myusername}[], diff --git a/alpine.spec b/alpine.spec index 2b8134d..a1982e6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.20 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,8 +126,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 09 2015 Rex Dieter 2.20-2 +- use patched alpine sources (#1270331,#1270183) + * Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 -- Build from new upstream for 2.10, fixes rhbz#1092688 rhbz#1142890 +- Build from new upstream for 2.20, fixes rhbz#1092688 rhbz#1142890 * Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 937a499..a1751d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -043b67666af73b26f9627ad97e2aaf92 alpine-2.20.tar.xz +2d63c923f7995890c0eecfc0c3d1c936 alpine-2.20.tar.xz From 3d2fb8721c4ef549ad0fb846bdd1061af74eecca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:07:03 +0000 Subject: [PATCH 33/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index a1982e6..f17823e 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.20 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Oct 09 2015 Rex Dieter 2.20-2 - use patched alpine sources (#1270331,#1270183) From f9d711a4bd3c2857b2352a0614107b399616cb01 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Feb 2016 12:26:09 -0600 Subject: [PATCH 34/84] workaround crash on imap login (#1282092) --- alpine.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index f17823e..e318a99 100644 --- a/alpine.spec +++ b/alpine.spec @@ -1,9 +1,12 @@ # Fedora review: http://bugzilla.redhat.com/249365 +# crasher workaround, http://bugzilla.redhat.com/1282092 +%undefine _hardened_build + Summary: powerful, easy to use console email client Name: alpine Version: 2.20 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 04 2016 Rex Dieter 2.20-4 +- workaround crash on imap login (#1282092) + * Wed Feb 03 2016 Fedora Release Engineering - 2.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b80e08b3747e69c372fe350e76904e86ec643dad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:53:40 +0000 Subject: [PATCH 35/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index e318a99..10fbd80 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: Applications/Internet @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Rex Dieter 2.20-4 - workaround crash on imap login (#1282092) From 12a8ca6199796ff44a3c836d0db1612e3b9a108f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Jun 2017 13:00:54 -0500 Subject: [PATCH 36/84] alpine 2.21, update URL, .spec cosmetics --- .gitignore | 1 + alpine.spec | 20 +++++++------------- sources | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 8f7d111..3489436 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ alpine-2.00.tar.bz2 /alpine-2.10.clean.tar.lzma /alpine-2.11.tar.xz /alpine-2.20.tar.xz +/alpine-2.21.tar.xz diff --git a/alpine.spec b/alpine.spec index 10fbd80..a7816bf 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,16 +5,15 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.20 -Release: 5%{?dist} +Version: 2.21 +Release: 1%{?dist} License: ASL 2.0 -Group: Applications/Internet # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ #URL: http://re-alpine.sourceforge.net/ #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 -URL: http://patches.freeiz.com/alpine/info/alpine.html -Source0: http://patches.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz +URL: http://alpine.freeiz.com/ +Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -75,8 +74,6 @@ GNU Build System's autotools. install -m644 -p %{SOURCE1} . -#autoreconf -f -i - %build touch imap/ip6 @@ -97,7 +94,6 @@ make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # create/touch %ghost'd files @@ -106,12 +102,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc README LICENSE %doc README.fedora %ghost %config(noreplace) %{_sysconfdir}/pine.conf @@ -129,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 16 2017 Rex Dieter - 2.21-1 +- alpine 2.21, update URL, .spec cosmetics + * Fri Feb 10 2017 Fedora Release Engineering - 2.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a1751d0..00bb3d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d63c923f7995890c0eecfc0c3d1c936 alpine-2.20.tar.xz +SHA512 (alpine-2.21.tar.xz) = a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 From 0f13dce328c5e6fea91047b9dede78d8ad897e05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:46:44 +0000 Subject: [PATCH 37/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index a7816bf..7313923 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ @@ -120,6 +120,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 16 2017 Rex Dieter - 2.21-1 - alpine 2.21, update URL, .spec cosmetics From 7d6e8413c81f6cd75f0a17082a68269d8eeb08f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:31:06 +0000 Subject: [PATCH 38/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 7313923..493f5db 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ @@ -120,6 +120,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b6aac75f6ac00b0920640f7af241df0fc2a7c694 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Nov 2017 14:24:59 -0600 Subject: [PATCH 39/84] use patched features release tarball, adjust Source0 URL accordingly (#1486899) --- .gitignore | 6 ------ alpine.spec | 8 ++++++-- sources | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3489436..0f4add1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -alpine-2.00.tar.bz2 -/re-alpine-2.02.tar.bz2 -/re-alpine-2.03.tar.bz2 -/alpine-2.10.clean.tar.lzma -/alpine-2.11.tar.xz -/alpine-2.20.tar.xz /alpine-2.21.tar.xz diff --git a/alpine.spec b/alpine.spec index 493f5db..8952933 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,14 +6,15 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ #URL: http://re-alpine.sourceforge.net/ #Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 URL: http://alpine.freeiz.com/ -Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz +#Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz +Source0: http://alpine.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -120,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Nov 15 2017 Rex Dieter - 2.21-4 +- use patched features release tarball, adjust Source0 URL accordingly (#1486899) + * Wed Aug 02 2017 Fedora Release Engineering - 2.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 00bb3d2..61949ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.21.tar.xz) = a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 +SHA512 (alpine-2.21.tar.xz) = b140355f990b68e9e534ae4363ec42824a176a4e86f5b372c401fba436aeb554ffab9847c27ffa407e33253d3e1d69270f1ae02ba2f3d20738282c338871a514 From b1296b7dd2f4cb9ac72823b56c869e889d2642a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:08:53 +0000 Subject: [PATCH 40/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 8952933..a988fa6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ @@ -121,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Nov 15 2017 Rex Dieter - 2.21-4 - use patched features release tarball, adjust Source0 URL accordingly (#1486899) From e133b0dc25a58a092d7c93e77d0c65ebabb0cd50 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:01:23 +0100 Subject: [PATCH 41/84] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- alpine.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index a988fa6..07dda92 100644 --- a/alpine.spec +++ b/alpine.spec @@ -29,7 +29,6 @@ Source1: README.fedora # I understand this to be a special case of the "Optional Functionality" # description at http://fedoraproject.org/wiki/Packaging/Conflicts Conflicts: pine -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: re-alpine = %{version}-%{release} From 8e6e2e4e0a8c23a0eb0c7171c67ba6b4472d3dfd Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 6 Mar 2018 15:41:39 +0100 Subject: [PATCH 42/84] add Buildrequires: gcc https://fedoraproject.org/wiki/Packaging:C_and_C++ --- alpine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 07dda92..14014ed 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ @@ -50,6 +50,7 @@ Requires: hunspell Requires: mailcap Requires: /usr/sbin/sendmail +BuildRequires: gcc %description Alpine -- an Alternatively Licensed Program for Internet @@ -120,6 +121,10 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Mar 06 2018 josef radinger - 2.21-6 +- add Buildrequires: gcc + https://fedoraproject.org/wiki/Packaging:C_and_C++ + * Wed Feb 07 2018 Fedora Release Engineering - 2.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 16927c9b0efa26c6db81ebda2eee4e9cb3438707 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 May 2018 08:20:05 -0500 Subject: [PATCH 43/84] new URL use %license, %make_build, %make_install --- alpine.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/alpine.spec b/alpine.spec index 14014ed..7529e4c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,15 +6,11 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 -# Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ -#URL: http://re-alpine.sourceforge.net/ -#Source0: http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2 -URL: http://alpine.freeiz.com/ -#Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz -Source0: http://alpine.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz +URL: http://alpine.x10host.com/ +Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -91,11 +87,11 @@ touch imap/ip6 --with-system-pinerc=%{_sysconfdir}/pine.conf \ --with-system-fixed-pinerc=%{_sysconfdir}/pine.conf.fixed -make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" +%make_build EXTRACFLAGS="$RPM_OPT_FLAGS" %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # create/touch %ghost'd files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} @@ -104,8 +100,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %files -%doc README LICENSE +%doc README %doc README.fedora +%license LICENSE %ghost %config(noreplace) %{_sysconfdir}/pine.conf %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine @@ -121,6 +118,10 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Mon May 21 2018 Rex Dieter - 2.21-7 +- new URL +- use %%license, %%make_build, %%make_install + * Tue Mar 06 2018 josef radinger - 2.21-6 - add Buildrequires: gcc https://fedoraproject.org/wiki/Packaging:C_and_C++ From c969a931096a63ebd306ac49dd20d9c4bb056962 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:09:18 +0000 Subject: [PATCH 44/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 7529e4c..51fb33c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -118,6 +118,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.21-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 21 2018 Rex Dieter - 2.21-7 - new URL - use %%license, %%make_build, %%make_install From 17f642d5c06beb9a34c5eb3fc4147ccdbce992a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:12:39 +0000 Subject: [PATCH 45/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 51fb33c..ea6ab93 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 8%{?dist} +Release: 9%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -118,6 +118,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.21-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.21-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 43f65ee767365e4793c6ba4748fa9bad722142b6 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sun, 21 Jul 2019 12:34:13 -0400 Subject: [PATCH 46/84] - Patch to suppress sending the user-agent per default --- alpine-2.21-useragent.patch | 55 +++++++++++++++++++++++++++++++++++++ alpine.spec | 8 +++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 alpine-2.21-useragent.patch diff --git a/alpine-2.21-useragent.patch b/alpine-2.21-useragent.patch new file mode 100644 index 0000000..83c1da2 --- /dev/null +++ b/alpine-2.21-useragent.patch @@ -0,0 +1,55 @@ +diff --git a/doc/tech-notes/config.html b/doc/tech-notes/config.html +index b935483..751429c 100644 +--- a/doc/tech-notes/config.html ++++ b/doc/tech-notes/config.html +@@ -7695,7 +7695,7 @@ If you'd like to suppress the echoing of the asterisks set this feature. + +
suppress-user-agent-when-sending +
If this feature is set then Alpine will not generate a +-User-Agent header in outgoing messages. ++User-Agent header in outgoing messages. It is set by default. +

+ +

tab-checks-recent +diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt +index 2762c5b..b2d8cdd 100644 +--- a/doc/tech-notes/tech-notes.txt ++++ b/doc/tech-notes/tech-notes.txt +@@ -6629,7 +6629,7 @@ John: on a job well done! + the echoing of the asterisks set this feature. + _suppress-user-agent-when-sending_ + If this feature is set then _Alpine_ will not generate a +- User-Agent header in outgoing messages. ++ User-Agent header in outgoing messages. It is set by default. + _tab-checks-recent_ + In a FOLDER LIST screen, the TAB key usually just changes which + folder is highlighted. If this feature is set, then the TAB key +diff --git a/pith/conf.c b/pith/conf.c +index cea59de..529c063 100644 +--- a/pith/conf.c ++++ b/pith/conf.c +@@ -3251,7 +3251,7 @@ feature_list(int index) + {"quell-timezone-comment-when-sending", "Suppress Timezone Comment When Sending", + F_QUELL_TIMEZONE, h_config_quell_tz_comment, PREF_MISC, 0}, + {"suppress-user-agent-when-sending", NULL, +- F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 0}, ++ F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 1}, + {"tab-checks-recent", "Tab Checks for Recent Messages", + F_TAB_CHK_RECENT, h_config_tab_checks_recent, PREF_MISC, 0}, + {"termdef-takes-precedence", NULL, +diff --git a/pith/pine.hlp b/pith/pine.hlp +index 1da108f..3ca4ca8 100644 +--- a/pith/pine.hlp ++++ b/pith/pine.hlp +@@ -34823,7 +34823,7 @@ emit a beep to become silent. +

FEATURE:

+ + If this feature is set then Alpine will not generate a +-User-Agent header in outgoing messages. ++User-Agent header in outgoing messages. It is set by default. +

+

    +
  • Finding more information and requesting help +-- +2.20.1 + diff --git a/alpine.spec b/alpine.spec index ea6ab93..d106dd2 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,13 +6,15 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 9%{?dist} +Release: 10%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora +Patch1: alpine-2.21-useragent.patch + # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user # functionality such as non-ASCII encoded saved passwords. Additionally, there @@ -68,6 +70,7 @@ GNU Build System's autotools. %prep %setup -q -n alpine-%{version} +%patch1 -p1 install -m644 -p %{SOURCE1} . @@ -118,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Sun Jul 21 2019 Paul Wouters - 2.21-10 +- Patch to suppress sending the user-agent per default + * Thu Jan 31 2019 Fedora Release Engineering - 2.21-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6268bb4716731c3ee6b47f58650d8f88a37355fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:47:20 +0000 Subject: [PATCH 47/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index d106dd2..59ef53c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 10%{?dist} +Release: 11%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -121,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.21-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 21 2019 Paul Wouters - 2.21-10 - Patch to suppress sending the user-agent per default From 80c1ef4b6ed53aa7596af9112f2a8e3505b2d237 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:27:06 +0000 Subject: [PATCH 48/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 59ef53c..8c5fb9f 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 11%{?dist} +Release: 12%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -121,6 +121,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.21-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.21-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9da68841574f5f39c357760cc4a1eb9a25d06e4b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 13 Feb 2020 17:24:29 +0100 Subject: [PATCH 49/84] fixed multiple definition of symbols --- alpine-2.21-gcc10.patch | 31 +++++++++++++++++++++++++++++++ alpine.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 alpine-2.21-gcc10.patch diff --git a/alpine-2.21-gcc10.patch b/alpine-2.21-gcc10.patch new file mode 100644 index 0000000..2c2726a --- /dev/null +++ b/alpine-2.21-gcc10.patch @@ -0,0 +1,31 @@ +diff -up alpine-2.21/alpine/alpine.c.me alpine-2.21/alpine/alpine.c +diff -up alpine-2.21/pith/smime.c.me alpine-2.21/pith/smime.c +--- alpine-2.21/pith/smime.c.me 2020-02-13 16:54:36.842373446 +0100 ++++ alpine-2.21/pith/smime.c 2020-02-13 17:13:37.930022666 +0100 +@@ -45,6 +45,7 @@ static char rcsid[] = "$Id: smime.c 1176 + #ifdef PASSFILE + #include "../pith/imap.h" + #endif /* PASSFILE */ ++#include "../pith/options.h" + + #include + #include +diff -up alpine-2.21/pith/smkeys.c.me alpine-2.21/pith/smkeys.c +--- alpine-2.21/pith/smkeys.c.me 2020-02-13 16:54:29.930310541 +0100 ++++ alpine-2.21/pith/smkeys.c 2020-02-13 17:15:00.688801681 +0100 +@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 126 + #include "../pith/util.h" + #include "../pith/mailindx.h" + #include "../pith/readfile.h" ++#include "../pith/options.h" + #include "smkeys.h" + + #ifdef APPLEKEYCHAIN +@@ -50,7 +51,6 @@ static int mem_add_extra_cacerts(c + int compare_certs_by_name(const void *data1, const void *data2); + int password_policy_check(char *); + +-int (*pith_smime_enter_password)(char *, char *, size_t); + + /* test if password passes a predetermined policy. + * return value: 0 - does not pass; 1 - it passes diff --git a/alpine.spec b/alpine.spec index 8c5fb9f..b470a35 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.21 -Release: 12%{?dist} +Release: 13%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -14,6 +14,7 @@ Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{ver Source1: README.fedora Patch1: alpine-2.21-useragent.patch +Patch2: alpine-2.21-gcc10.patch # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -71,6 +72,7 @@ GNU Build System's autotools. %prep %setup -q -n alpine-%{version} %patch1 -p1 +%patch2 -p1 install -m644 -p %{SOURCE1} . @@ -121,6 +123,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Thu Feb 13 2020 Than Ngo - 2.21-13 +- fixed multiple definition of symbols + * Tue Jan 28 2020 Fedora Release Engineering - 2.21-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7df45d81e6deefe8bb0817c85cf405616aa495f7 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 24 Mar 2020 19:51:47 +0100 Subject: [PATCH 50/84] bump version --- .gitignore | 1 + README.fedora | 3 ++- alpine.spec | 7 +++++-- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0f4add1..a4d34d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /alpine-2.21.tar.xz +/alpine-2.22.tar.xz diff --git a/README.fedora b/README.fedora index 53d86c2..033ea65 100644 --- a/README.fedora +++ b/README.fedora @@ -1,6 +1,7 @@ = mlock = -If you get a notice "[Folder vulnerable - directory /var/mail must have 1777 protection]", you may want install the uw-imap-utils package to get setgid mlock (BZ #427561) +If you get a notice "[Folder vulnerable - directory /var/mail must have 1777 protection]", +you may want to install the uw-imap-utils package to get setgid mlock (BZ #427561) An example pinerc line: mymaildir {localhost/ssl/novalidate-cert/user=myusername}[], diff --git a/alpine.spec b/alpine.spec index b470a35..3eda420 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,8 +5,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.21 -Release: 13%{?dist} +Version: 2.22 +Release: 1%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -123,6 +123,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Mar 24 2020 josef radinger - 2.22-1 +- bump version + * Thu Feb 13 2020 Than Ngo - 2.21-13 - fixed multiple definition of symbols diff --git a/sources b/sources index 61949ca..aaa2210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.21.tar.xz) = b140355f990b68e9e534ae4363ec42824a176a4e86f5b372c401fba436aeb554ffab9847c27ffa407e33253d3e1d69270f1ae02ba2f3d20738282c338871a514 +SHA512 (alpine-2.22.tar.xz) = cc020fd671f2b5ddb4a6a4bc307d8605c4311f25b82c9909ae05e38271f180fc871acdcab19c098f6259aa7ef5e711ca9650ed0ecfab2f20813578c317744eb3 From c54a24508fae1f916bd5ac7f6c85ccd5d8b3ec71 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 22 Jun 2020 21:36:49 +0200 Subject: [PATCH 51/84] bump version --- .gitignore | 1 + alpine-2.21-gcc10.patch | 31 ------------------------------- alpine-2.23-gcc10.patch | 12 ++++++++++++ alpine.spec | 8 ++++++-- sources | 2 +- 5 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 alpine-2.21-gcc10.patch create mode 100644 alpine-2.23-gcc10.patch diff --git a/.gitignore b/.gitignore index a4d34d8..272cd63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /alpine-2.21.tar.xz /alpine-2.22.tar.xz +/alpine-2.23.tar.xz diff --git a/alpine-2.21-gcc10.patch b/alpine-2.21-gcc10.patch deleted file mode 100644 index 2c2726a..0000000 --- a/alpine-2.21-gcc10.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up alpine-2.21/alpine/alpine.c.me alpine-2.21/alpine/alpine.c -diff -up alpine-2.21/pith/smime.c.me alpine-2.21/pith/smime.c ---- alpine-2.21/pith/smime.c.me 2020-02-13 16:54:36.842373446 +0100 -+++ alpine-2.21/pith/smime.c 2020-02-13 17:13:37.930022666 +0100 -@@ -45,6 +45,7 @@ static char rcsid[] = "$Id: smime.c 1176 - #ifdef PASSFILE - #include "../pith/imap.h" - #endif /* PASSFILE */ -+#include "../pith/options.h" - - #include - #include -diff -up alpine-2.21/pith/smkeys.c.me alpine-2.21/pith/smkeys.c ---- alpine-2.21/pith/smkeys.c.me 2020-02-13 16:54:29.930310541 +0100 -+++ alpine-2.21/pith/smkeys.c 2020-02-13 17:15:00.688801681 +0100 -@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 126 - #include "../pith/util.h" - #include "../pith/mailindx.h" - #include "../pith/readfile.h" -+#include "../pith/options.h" - #include "smkeys.h" - - #ifdef APPLEKEYCHAIN -@@ -50,7 +51,6 @@ static int mem_add_extra_cacerts(c - int compare_certs_by_name(const void *data1, const void *data2); - int password_policy_check(char *); - --int (*pith_smime_enter_password)(char *, char *, size_t); - - /* test if password passes a predetermined policy. - * return value: 0 - does not pass; 1 - it passes diff --git a/alpine-2.23-gcc10.patch b/alpine-2.23-gcc10.patch new file mode 100644 index 0000000..fc72972 --- /dev/null +++ b/alpine-2.23-gcc10.patch @@ -0,0 +1,12 @@ +diff -up alpine-2.21/alpine/alpine.c.me alpine-2.21/alpine/alpine.c +diff -up alpine-2.21/pith/smime.c.me alpine-2.21/pith/smime.c +--- alpine-2.21/pith/smime.c.me 2020-02-13 16:54:36.842373446 +0100 ++++ alpine-2.21/pith/smime.c 2020-02-13 17:13:37.930022666 +0100 +@@ -45,6 +45,7 @@ static char rcsid[] = "$Id: smime.c 1176 + #ifdef PASSFILE + #include "../pith/imap.h" + #endif /* PASSFILE */ ++#include "../pith/options.h" + + #include + #include diff --git a/alpine.spec b/alpine.spec index 3eda420..3f651c9 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,7 +5,7 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.22 +Version: 2.23 Release: 1%{?dist} License: ASL 2.0 @@ -14,7 +14,7 @@ Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{ver Source1: README.fedora Patch1: alpine-2.21-useragent.patch -Patch2: alpine-2.21-gcc10.patch +Patch2: alpine-2.23-gcc10.patch # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -123,6 +123,10 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Mon Jun 22 2020 josef radinger - 2.23-1 +- bump version +- update patch2 alpine-2.23-gcc10.patch + * Tue Mar 24 2020 josef radinger - 2.22-1 - bump version diff --git a/sources b/sources index aaa2210..646dc17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.22.tar.xz) = cc020fd671f2b5ddb4a6a4bc307d8605c4311f25b82c9909ae05e38271f180fc871acdcab19c098f6259aa7ef5e711ca9650ed0ecfab2f20813578c317744eb3 +SHA512 (alpine-2.23.tar.xz) = a536d7016fbf848e3fe72e9f8d7e8b30bfbe2b4a657d97fb8ff8a3a2e65f05d002194afbcefc7605dd401eb7deac4b30f3c24388c8a349487b60361ddd8f81ae From 9d6b023788c7487339a1c634bc6892f755e7e84f Mon Sep 17 00:00:00 2001 From: josef radinger Date: Wed, 24 Jun 2020 09:08:24 +0200 Subject: [PATCH 52/84] add comment on CVE-2020-14929 --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 3f651c9..9b6d70f 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.23 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -123,6 +123,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Jun 23 2020 josef radinger - 2.23-2 +- 2.23 fixes CVE-2020-14929 (#1850048) and new version (#1848786) + * Mon Jun 22 2020 josef radinger - 2.23-1 - bump version - update patch2 alpine-2.23-gcc10.patch From 980977d91c72f20b121c593543aec6a65066f6b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:56:58 +0000 Subject: [PATCH 53/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 9b6d70f..79374cc 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.23 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -123,6 +123,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 23 2020 josef radinger - 2.23-2 - 2.23 fixes CVE-2020-14929 (#1850048) and new version (#1848786) From 6bbbac327fc42030d08750a45749afb0b80e8a9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:55:26 +0000 Subject: [PATCH 54/84] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 79374cc..27ed834 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.23 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -123,6 +123,10 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.23-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 059b4ee961c8ba57614e0ae25f19dc38c5786046 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 11 Oct 2020 13:38:04 +0200 Subject: [PATCH 55/84] bump version --- alpine.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alpine.spec b/alpine.spec index 27ed834..0349c79 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,8 +5,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.23 -Release: 4%{?dist} +Version: 2.24 +Release: 1%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -123,6 +123,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Sun Oct 11 2020 josef radinger - 2.24-1 +- bump version + * Fri Jul 31 2020 Fedora Release Engineering - 2.23-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f95042215fd40c2d2c9b93ceedf0e32f631ac21a Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 11 Oct 2020 13:51:21 +0200 Subject: [PATCH 56/84] new version --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 272cd63..d686cec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /alpine-2.21.tar.xz /alpine-2.22.tar.xz /alpine-2.23.tar.xz +/alpine-2.24.tar.xz diff --git a/sources b/sources index 646dc17..c9d8947 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.23.tar.xz) = a536d7016fbf848e3fe72e9f8d7e8b30bfbe2b4a657d97fb8ff8a3a2e65f05d002194afbcefc7605dd401eb7deac4b30f3c24388c8a349487b60361ddd8f81ae +SHA512 (alpine-2.24.tar.xz) = 04b1dbdfa07b995d9ed045b280eb9fbd98fc2f12c116b19f9445aae5814562991c471b4f788db8cd904d54a5f18c7ba68769b103371134961824e4c68868f204 From 76618bcd86bf93fb42d21502e5b38178eff21918 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sun, 11 Oct 2020 14:07:39 +0200 Subject: [PATCH 57/84] modify patch1 --- ...1-useragent.patch => alpine-2.24-useragent.patch | 13 ------------- alpine.spec | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) rename alpine-2.21-useragent.patch => alpine-2.24-useragent.patch (74%) diff --git a/alpine-2.21-useragent.patch b/alpine-2.24-useragent.patch similarity index 74% rename from alpine-2.21-useragent.patch rename to alpine-2.24-useragent.patch index 83c1da2..f68f911 100644 --- a/alpine-2.21-useragent.patch +++ b/alpine-2.24-useragent.patch @@ -24,19 +24,6 @@ index 2762c5b..b2d8cdd 100644 _tab-checks-recent_ In a FOLDER LIST screen, the TAB key usually just changes which folder is highlighted. If this feature is set, then the TAB key -diff --git a/pith/conf.c b/pith/conf.c -index cea59de..529c063 100644 ---- a/pith/conf.c -+++ b/pith/conf.c -@@ -3251,7 +3251,7 @@ feature_list(int index) - {"quell-timezone-comment-when-sending", "Suppress Timezone Comment When Sending", - F_QUELL_TIMEZONE, h_config_quell_tz_comment, PREF_MISC, 0}, - {"suppress-user-agent-when-sending", NULL, -- F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 0}, -+ F_QUELL_USERAGENT, h_config_suppress_user_agent, PREF_MISC, 1}, - {"tab-checks-recent", "Tab Checks for Recent Messages", - F_TAB_CHK_RECENT, h_config_tab_checks_recent, PREF_MISC, 0}, - {"termdef-takes-precedence", NULL, diff --git a/pith/pine.hlp b/pith/pine.hlp index 1da108f..3ca4ca8 100644 --- a/pith/pine.hlp diff --git a/alpine.spec b/alpine.spec index 0349c79..d148fbf 100644 --- a/alpine.spec +++ b/alpine.spec @@ -13,7 +13,7 @@ URL: http://alpine.x10host.com/ Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz Source1: README.fedora -Patch1: alpine-2.21-useragent.patch +Patch1: alpine-2.24-useragent.patch Patch2: alpine-2.23-gcc10.patch # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -125,6 +125,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog * Sun Oct 11 2020 josef radinger - 2.24-1 - bump version +- modify %%patch1 * Fri Jul 31 2020 Fedora Release Engineering - 2.23-4 - Second attempt - Rebuilt for From a47785f4c31cfd7d6cc2542d30321744dc2f84e4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:24:15 +0000 Subject: [PATCH 58/84] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- alpine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine.spec b/alpine.spec index d148fbf..ad5216e 100644 --- a/alpine.spec +++ b/alpine.spec @@ -50,6 +50,7 @@ Requires: mailcap Requires: /usr/sbin/sendmail BuildRequires: gcc +BuildRequires: make %description Alpine -- an Alternatively Licensed Program for Internet From b436d2cebd56be9ccdeff0ad10fa519fab146102 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:00:07 +0000 Subject: [PATCH 59/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index ad5216e..0b5549a 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.24 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Oct 11 2020 josef radinger - 2.24-1 - bump version - modify %%patch1 From a37b78f16e57b0b0903ce3f44e68c8f71192a3cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:32:29 +0000 Subject: [PATCH 60/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e1c3ad91e4820b543b65cef3c26896110137276a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:27:53 +0000 Subject: [PATCH 61/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 0b5549a..efc2c2c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.24 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1834f6ed32d5b4a9e6d5b5e40467a76036956105 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 18:58:24 +0200 Subject: [PATCH 62/84] Rebuilt with OpenSSL 3.0.0 --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index efc2c2c..922a0d6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.24 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.24-4 +- Rebuilt with OpenSSL 3.0.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.24-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From fdcd375d7a3a7d8cca43cb7aa1201067fe3f9944 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 16 Nov 2021 17:01:18 +0100 Subject: [PATCH 63/84] bump version --- .gitignore | 1 + alpine.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d686cec..1ade1ea 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /alpine-2.22.tar.xz /alpine-2.23.tar.xz /alpine-2.24.tar.xz +/alpine-2.25.tar.xz diff --git a/alpine.spec b/alpine.spec index 922a0d6..814396c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,8 +5,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.24 -Release: 4%{?dist} +Version: 2.25 +Release: 1%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Tue Nov 16 2021 josef radinger - 2.25-1 +- bump version + * Tue Sep 14 2021 Sahana Prasad - 2.24-4 - Rebuilt with OpenSSL 3.0.0 diff --git a/sources b/sources index c9d8947..8311dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.24.tar.xz) = 04b1dbdfa07b995d9ed045b280eb9fbd98fc2f12c116b19f9445aae5814562991c471b4f788db8cd904d54a5f18c7ba68769b103371134961824e4c68868f204 +SHA512 (alpine-2.25.tar.xz) = 4cfabd49f08db8ef22725201a62267cf3893886461ff2e377d72856fe85dc954ee304d25a004367f01fb34be91d69a4c292be3e5e335b6788e886e652b9fc723 From 00dea0b7fa0433442e0835fe41fc47c94a143fb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:08:54 +0000 Subject: [PATCH 64/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 814396c..a460ab5 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.25 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 16 2021 josef radinger - 2.25-1 - bump version From 82aa483a5e7af253432ed7939f92b0c631bdbb3a Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 9 Jun 2022 10:19:39 +0200 Subject: [PATCH 65/84] bump version --- .gitignore | 1 + alpine.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1ade1ea..6918a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /alpine-2.23.tar.xz /alpine-2.24.tar.xz /alpine-2.25.tar.xz +/alpine-2.26.tar.xz diff --git a/alpine.spec b/alpine.spec index a460ab5..7655deb 100644 --- a/alpine.spec +++ b/alpine.spec @@ -5,8 +5,8 @@ Summary: powerful, easy to use console email client Name: alpine -Version: 2.25 -Release: 2%{?dist} +Version: 2.26 +Release: 1%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Thu Jun 09 2022 josef radinger - 2.26-1 +- bump version + * Wed Jan 19 2022 Fedora Release Engineering - 2.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 8311dd4..db13476 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.25.tar.xz) = 4cfabd49f08db8ef22725201a62267cf3893886461ff2e377d72856fe85dc954ee304d25a004367f01fb34be91d69a4c292be3e5e335b6788e886e652b9fc723 +SHA512 (alpine-2.26.tar.xz) = e9b13a225593a8a346b2ed3ece53db99f69ffce45783ce5037a813b6962f5b9f72c593b3252d7c079748384aa68d13702f783ef259d222d6490cc57b2e82c9ce From b1e9f3f0f9930560f6171e2507a51d6a30542eff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:40:33 +0000 Subject: [PATCH 66/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 7655deb..32e045c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -124,6 +124,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 09 2022 josef radinger - 2.26-1 - bump version From 309c89b9153e81c877a61afa7aa8db6826b102a3 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 26 Nov 2022 21:29:17 +0100 Subject: [PATCH 67/84] Port configure script to C99 (#2148656) Related to: --- alpine-configure-c99.patch | 29 +++++++++++++++++++++++++++++ alpine.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 alpine-configure-c99.patch diff --git a/alpine-configure-c99.patch b/alpine-configure-c99.patch new file mode 100644 index 0000000..55dceba --- /dev/null +++ b/alpine-configure-c99.patch @@ -0,0 +1,29 @@ +Avoid implicit int in qsort_t configure check, which can cause +the check to always fail for stricter C99 compilers. + +diff --git a/configure b/configure +index 2c417775d04165f3..956e56e223765ca5 100755 +--- a/configure ++++ b/configure +@@ -22034,7 +22034,7 @@ else + #endif + + extern void *base; +-extern sortf(const void *, const void *); ++extern int sortf(const void *, const void *); + int sortf(a, b) + const void *a; + const void *b; { return 0; } +diff --git a/configure.ac b/configure.ac +index 4fa94f16078daf61..9aa815cb9d08dddd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1964,7 +1964,7 @@ ac_cv_func_qsort_argtype, + #endif + + extern void *base; +-extern sortf(const void *, const void *); ++extern int sortf(const void *, const void *); + int sortf(a, b) + const void *a; + const void *b; { return 0; } diff --git a/alpine.spec b/alpine.spec index 32e045c..8b52228 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -15,6 +15,7 @@ Source1: README.fedora Patch1: alpine-2.24-useragent.patch Patch2: alpine-2.23-gcc10.patch +Patch3: alpine-configure-c99.patch # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user @@ -74,6 +75,7 @@ GNU Build System's autotools. %setup -q -n alpine-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 install -m644 -p %{SOURCE1} . @@ -124,6 +126,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Sat Nov 26 2022 Florian Weimer - 2.26-3 +- Port configure script to C99 (#2148656) + * Wed Jul 20 2022 Fedora Release Engineering - 2.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 51b73ab1865b8a42d7d2b5120defbbfd94ea002c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:37:14 +0000 Subject: [PATCH 68/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 8b52228..2fafa8a 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -126,6 +126,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Nov 26 2022 Florian Weimer - 2.26-3 - Port configure script to C99 (#2148656) From 80a1c50fb06f9e76389f0a1c800a2c9f174a91f8 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 5 May 2023 22:34:46 +0200 Subject: [PATCH 69/84] Use modern patch macros --- alpine.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/alpine.spec b/alpine.spec index 2fafa8a..9b98e4c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: http://alpine.x10host.com/ @@ -73,9 +73,9 @@ GNU Build System's autotools. %prep %setup -q -n alpine-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 install -m644 -p %{SOURCE1} . @@ -126,6 +126,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Fri May 5 2023 Steve Traylen - 2.26-5 +- Use modern patch macros + * Wed Jan 18 2023 Fedora Release Engineering - 2.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 298b87421241612c00a853d2d537ccf9aaeb1608 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 5 May 2023 23:33:33 +0200 Subject: [PATCH 70/84] Build with one CPU thread Build fails with make -i <1. Seems that with make directories are not created in time before they are needed. --- alpine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alpine.spec b/alpine.spec index 9b98e4c..1e05f22 100644 --- a/alpine.spec +++ b/alpine.spec @@ -95,6 +95,9 @@ touch imap/ip6 --with-system-pinerc=%{_sysconfdir}/pine.conf \ --with-system-fixed-pinerc=%{_sysconfdir}/pine.conf.fixed + +# Build single threaded, make is not creating directories in time. +export RPM_BUILD_NCPUS=1 %make_build EXTRACFLAGS="$RPM_OPT_FLAGS" @@ -127,6 +130,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog * Fri May 5 2023 Steve Traylen - 2.26-5 +- Build with one CPU thread - Use modern patch macros * Wed Jan 18 2023 Fedora Release Engineering - 2.26-4 From ea686f51436410e42e50edff92012be69ed363a8 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 5 May 2023 23:45:24 +0200 Subject: [PATCH 71/84] switch to new upstream --- .gitignore | 1 + alpine.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6918a0d..0bcd086 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /alpine-2.24.tar.xz /alpine-2.25.tar.xz /alpine-2.26.tar.xz +/alpine-2.26_new_upstream.tar.xz diff --git a/alpine.spec b/alpine.spec index 1e05f22..f4fc0e1 100644 --- a/alpine.spec +++ b/alpine.spec @@ -9,8 +9,15 @@ Version: 2.26 Release: 5%{?dist} License: ASL 2.0 -URL: http://alpine.x10host.com/ -Source0: http://alpine.x10host.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz +URL: https://alpineapp.email/ + +# alpine-2.26_new_upstream.tar.xz was generated from the new upstream location +# wget https://alpineapp.email/alpine/release/src/alpine-2.26.tar.xz +# mv alpine-2.26.tar.xz alpine_upstream-2.26.tar.xz +# alpine-2.26.tar.xz is slightly different between what Fedora has cached and +# what is at the new upstream. The old location no longer exists +# Clearly this shuffle should be removed as soon as a new release appears. +Source0: alpine-2.26_new_upstream.tar.xz Source1: README.fedora Patch1: alpine-2.24-useragent.patch @@ -130,6 +137,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog * Fri May 5 2023 Steve Traylen - 2.26-5 +- Switch to new alineapp.email upstream (rhbz#2187297) - Build with one CPU thread - Use modern patch macros diff --git a/sources b/sources index db13476..07025d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.26.tar.xz) = e9b13a225593a8a346b2ed3ece53db99f69ffce45783ce5037a813b6962f5b9f72c593b3252d7c079748384aa68d13702f783ef259d222d6490cc57b2e82c9ce +SHA512 (alpine-2.26_new_upstream.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2 From 3401be2b94b0167965e6f3bb4433b877aab6b0c7 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 5 May 2023 23:48:43 +0200 Subject: [PATCH 72/84] Switch to SPDX License field --- alpine.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index f4fc0e1..1dbb5fa 100644 --- a/alpine.spec +++ b/alpine.spec @@ -8,7 +8,7 @@ Name: alpine Version: 2.26 Release: 5%{?dist} -License: ASL 2.0 +License: Apache-2.0 URL: https://alpineapp.email/ # alpine-2.26_new_upstream.tar.xz was generated from the new upstream location @@ -137,6 +137,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog * Fri May 5 2023 Steve Traylen - 2.26-5 +- Switch to SPDX License field - Switch to new alineapp.email upstream (rhbz#2187297) - Build with one CPU thread - Use modern patch macros From 809564696929ca7763a0ceba61432a329b778c91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:09:13 +0000 Subject: [PATCH 73/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 1dbb5fa..1f2d048 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 5%{?dist} +Release: 6%{?dist} License: Apache-2.0 URL: https://alpineapp.email/ @@ -136,6 +136,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri May 5 2023 Steve Traylen - 2.26-5 - Switch to SPDX License field - Switch to new alineapp.email upstream (rhbz#2187297) From 5b6de9c3c9d62e35087f4d3ec9adb235e0d88e77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:44:12 +0000 Subject: [PATCH 74/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 1f2d048..0abc36a 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 6%{?dist} +Release: 7%{?dist} License: Apache-2.0 URL: https://alpineapp.email/ @@ -136,6 +136,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.26-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9bac127846d5945e4296fe4b9c9609d485d55289 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:55:49 +0000 Subject: [PATCH 75/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alpine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index 0abc36a..1824aba 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 7%{?dist} +Release: 8%{?dist} License: Apache-2.0 URL: https://alpineapp.email/ @@ -136,6 +136,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.26-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 47ce97599e7adb1217f539af8133cb09ec4f1da9 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 22 Jun 2024 13:18:20 +0200 Subject: [PATCH 76/84] Convert to %autorelease and %autochangelog [skip changelog] --- alpine.spec | 257 +--------------------------------------------------- changelog | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 255 deletions(-) create mode 100644 changelog diff --git a/alpine.spec b/alpine.spec index 1824aba..86331af 100644 --- a/alpine.spec +++ b/alpine.spec @@ -6,7 +6,7 @@ Summary: powerful, easy to use console email client Name: alpine Version: 2.26 -Release: 8%{?dist} +Release: %autorelease License: Apache-2.0 URL: https://alpineapp.email/ @@ -136,257 +136,4 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %changelog -* Mon Jan 22 2024 Fedora Release Engineering - 2.26-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.26-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.26-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri May 5 2023 Steve Traylen - 2.26-5 -- Switch to SPDX License field -- Switch to new alineapp.email upstream (rhbz#2187297) -- Build with one CPU thread -- Use modern patch macros - -* Wed Jan 18 2023 Fedora Release Engineering - 2.26-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Nov 26 2022 Florian Weimer - 2.26-3 -- Port configure script to C99 (#2148656) - -* Wed Jul 20 2022 Fedora Release Engineering - 2.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 09 2022 josef radinger - 2.26-1 -- bump version - -* Wed Jan 19 2022 Fedora Release Engineering - 2.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 16 2021 josef radinger - 2.25-1 -- bump version - -* Tue Sep 14 2021 Sahana Prasad - 2.24-4 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Jul 21 2021 Fedora Release Engineering - 2.24-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Oct 11 2020 josef radinger - 2.24-1 -- bump version -- modify %%patch1 - -* Fri Jul 31 2020 Fedora Release Engineering - 2.23-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 23 2020 josef radinger - 2.23-2 -- 2.23 fixes CVE-2020-14929 (#1850048) and new version (#1848786) - -* Mon Jun 22 2020 josef radinger - 2.23-1 -- bump version -- update patch2 alpine-2.23-gcc10.patch - -* Tue Mar 24 2020 josef radinger - 2.22-1 -- bump version - -* Thu Feb 13 2020 Than Ngo - 2.21-13 -- fixed multiple definition of symbols - -* Tue Jan 28 2020 Fedora Release Engineering - 2.21-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 2.21-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jul 21 2019 Paul Wouters - 2.21-10 -- Patch to suppress sending the user-agent per default - -* Thu Jan 31 2019 Fedora Release Engineering - 2.21-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.21-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 21 2018 Rex Dieter - 2.21-7 -- new URL -- use %%license, %%make_build, %%make_install - -* Tue Mar 06 2018 josef radinger - 2.21-6 -- add Buildrequires: gcc - https://fedoraproject.org/wiki/Packaging:C_and_C++ - -* Wed Feb 07 2018 Fedora Release Engineering - 2.21-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Nov 15 2017 Rex Dieter - 2.21-4 -- use patched features release tarball, adjust Source0 URL accordingly (#1486899) - -* Wed Aug 02 2017 Fedora Release Engineering - 2.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 16 2017 Rex Dieter - 2.21-1 -- alpine 2.21, update URL, .spec cosmetics - -* Fri Feb 10 2017 Fedora Release Engineering - 2.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Rex Dieter 2.20-4 -- workaround crash on imap login (#1282092) - -* Wed Feb 03 2016 Fedora Release Engineering - 2.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 09 2015 Rex Dieter 2.20-2 -- use patched alpine sources (#1270331,#1270183) - -* Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 -- Build from new upstream for 2.20, fixes rhbz#1092688 rhbz#1142890 - -* Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Nov 06 2013 Rex Dieter 2.11-1 -- alpine-2.11, drop old/unused patches - -* Thu Oct 31 2013 Rex Dieter 2.10-4 -- re-add README.fedora - -* Sat Aug 03 2013 Dennis Gilmore - 2.10-3 -- remove refrences to non existant README.fedora file - -* Sat Aug 03 2013 Fedora Release Engineering - 2.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Mar 15 2013 Paul Wouters - 2.10-1 -- Build from new upstream for 2.10, fixes rhbz#838359 - -* Wed Feb 13 2013 Fedora Release Engineering - 2.03-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 -- add README.fedora - -* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 -- re-alpine-2.03 (#880328,#888204) - -* Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Oct 08 2010 Rex Dieter - 2.02-1 -- re-alpine-2.02 (#465341) - -* Mon Jul 19 2010 Rex Dieter - 2.00-9 -- --with-npa=/usr/bin/inews -- --with-smtp-msa=/usr/sbin/sendmail - -* Fri Aug 21 2009 Tomas Mraz - 2.00-8 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 2.00-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 02 2009 Caolán McNamara - 2.00-6 -- --with-spellcheck-prog isn't a configure option use - --with-simple-spellcheck/--with-interactive-spellcheck and patch - to prefer hunspell to aspell (#509387) - -* Wed May 06 2009 Rex Dieter - 2.00-5 -- "reply to all recipients" doesn't include anyone on the Cc list (#496400) - -* Mon Feb 23 2009 Fedora Release Engineering - 2.00-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 15 2009 Tomas Mraz 2.00-3 -- rebuild with new openssl - -* Wed Nov 26 2008 Joshua Daniel Franklin 2.00-2 -- Fix package Summary text to not include package name -- http://www.redhat.com/archives/fedora-devel-list/2008-November/msg01484.html - -* Wed Aug 27 2008 Rex Dieter 2.00-1 -- alpine-2.00 (#460332) - -* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-4 -- No changes; Bump for tag system - -* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-3 -- No changes; Bump for tag system - -* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-2 -- Change License string to "ASL 2.0" instead of "Apache Software License" -- Disable debug files with "--enable-debug=no" (BZ #427013) - -* Mon Mar 24 2008 Rex Dieter - 1.10-1 -- alpine-1.10 -- cosmetic (Build)Req cleanup - -* Tue Feb 19 2008 Fedora Release Engineering - 1.00-3 -- Autorebuild for GCC 4.3 - -* Sat Dec 22 2007 Rex Dieter 1.00-2 -- --with-system-pinerc=%%_sysconfdir/pine.conf - --with-system-fixed-pinerc=%%_sysconfdir/pine.conf.fixed (#426512) - -* Fri Dec 21 2007 Rex Dieter 1.00-1 -- alpine-1.00 - -* Tue Dec 04 2007 Patrick "Jima" Laughton 0.99999-4 -- Bump-n-build for openldap/openssl soname changes - -* Thu Nov 15 2007 Joshua Daniel Franklin 0.99999-3 -- BuildRequires aspell to make configure happy - -* Fri Nov 09 2007 Joshua Daniel Franklin 0.99999-2 -- update to latest - -* Thu Oct 25 2007 Rex Dieter 0.9999-3 -- include stock pine.conf, pine.conf.fixed - -* Fri Sep 07 2007 Joshua Daniel Franklin 0.9999-2 -- update to latest - -* Fri Aug 24 2007 Rex Dieter 0.999-3 -- EXTRACFLAGS=$RPM_OPT_FLAGS -- --with-c-client-target=lfd -- --with-passfile=.alpine.passfile -- Requires: mailcap - -* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.2 -- remove problem cc5.sol file -- integrate changes from Patrick "Jima" Laughton - -* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.1 -- correct spec syntax, explain Conflicts tag - -* Mon Jul 23 2007 Joshua Daniel Franklin 0.999-2.0 -- initial alpine spec -- Apache Software License 2.0 - +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..51e7ae0 --- /dev/null +++ b/changelog @@ -0,0 +1,253 @@ +* Mon Jan 22 2024 Fedora Release Engineering - 2.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri May 5 2023 Steve Traylen - 2.26-5 +- Switch to SPDX License field +- Switch to new alineapp.email upstream (rhbz#2187297) +- Build with one CPU thread +- Use modern patch macros + +* Wed Jan 18 2023 Fedora Release Engineering - 2.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Nov 26 2022 Florian Weimer - 2.26-3 +- Port configure script to C99 (#2148656) + +* Wed Jul 20 2022 Fedora Release Engineering - 2.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 09 2022 josef radinger - 2.26-1 +- bump version + +* Wed Jan 19 2022 Fedora Release Engineering - 2.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 16 2021 josef radinger - 2.25-1 +- bump version + +* Tue Sep 14 2021 Sahana Prasad - 2.24-4 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 2.24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Oct 11 2020 josef radinger - 2.24-1 +- bump version +- modify %%patch1 + +* Fri Jul 31 2020 Fedora Release Engineering - 2.23-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 josef radinger - 2.23-2 +- 2.23 fixes CVE-2020-14929 (#1850048) and new version (#1848786) + +* Mon Jun 22 2020 josef radinger - 2.23-1 +- bump version +- update patch2 alpine-2.23-gcc10.patch + +* Tue Mar 24 2020 josef radinger - 2.22-1 +- bump version + +* Thu Feb 13 2020 Than Ngo - 2.21-13 +- fixed multiple definition of symbols + +* Tue Jan 28 2020 Fedora Release Engineering - 2.21-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.21-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 21 2019 Paul Wouters - 2.21-10 +- Patch to suppress sending the user-agent per default + +* Thu Jan 31 2019 Fedora Release Engineering - 2.21-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.21-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 21 2018 Rex Dieter - 2.21-7 +- new URL +- use %%license, %%make_build, %%make_install + +* Tue Mar 06 2018 josef radinger - 2.21-6 +- add Buildrequires: gcc + https://fedoraproject.org/wiki/Packaging:C_and_C++ + +* Wed Feb 07 2018 Fedora Release Engineering - 2.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Nov 15 2017 Rex Dieter - 2.21-4 +- use patched features release tarball, adjust Source0 URL accordingly (#1486899) + +* Wed Aug 02 2017 Fedora Release Engineering - 2.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 16 2017 Rex Dieter - 2.21-1 +- alpine 2.21, update URL, .spec cosmetics + +* Fri Feb 10 2017 Fedora Release Engineering - 2.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Rex Dieter 2.20-4 +- workaround crash on imap login (#1282092) + +* Wed Feb 03 2016 Fedora Release Engineering - 2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Oct 09 2015 Rex Dieter 2.20-2 +- use patched alpine sources (#1270331,#1270183) + +* Mon Jul 06 2015 Joshua Daniel Franklin 2.20-1 +- Build from new upstream for 2.20, fixes rhbz#1092688 rhbz#1142890 + +* Tue Jun 16 2015 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Nov 06 2013 Rex Dieter 2.11-1 +- alpine-2.11, drop old/unused patches + +* Thu Oct 31 2013 Rex Dieter 2.10-4 +- re-add README.fedora + +* Sat Aug 03 2013 Dennis Gilmore - 2.10-3 +- remove refrences to non existant README.fedora file + +* Sat Aug 03 2013 Fedora Release Engineering - 2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Mar 15 2013 Paul Wouters - 2.10-1 +- Build from new upstream for 2.10, fixes rhbz#838359 + +* Wed Feb 13 2013 Fedora Release Engineering - 2.03-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-2 +- add README.fedora + +* Thu Dec 20 2012 Joshua Daniel Franklin 2.03-1 +- re-alpine-2.03 (#880328,#888204) + +* Wed Jul 18 2012 Fedora Release Engineering - 2.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 2.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 2.02-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 08 2010 Rex Dieter - 2.02-1 +- re-alpine-2.02 (#465341) + +* Mon Jul 19 2010 Rex Dieter - 2.00-9 +- --with-npa=/usr/bin/inews +- --with-smtp-msa=/usr/sbin/sendmail + +* Fri Aug 21 2009 Tomas Mraz - 2.00-8 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 2.00-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 02 2009 Caolán McNamara - 2.00-6 +- --with-spellcheck-prog isn't a configure option use + --with-simple-spellcheck/--with-interactive-spellcheck and patch + to prefer hunspell to aspell (#509387) + +* Wed May 06 2009 Rex Dieter - 2.00-5 +- "reply to all recipients" doesn't include anyone on the Cc list (#496400) + +* Mon Feb 23 2009 Fedora Release Engineering - 2.00-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz 2.00-3 +- rebuild with new openssl + +* Wed Nov 26 2008 Joshua Daniel Franklin 2.00-2 +- Fix package Summary text to not include package name +- http://www.redhat.com/archives/fedora-devel-list/2008-November/msg01484.html + +* Wed Aug 27 2008 Rex Dieter 2.00-1 +- alpine-2.00 (#460332) + +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-4 +- No changes; Bump for tag system + +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-3 +- No changes; Bump for tag system + +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-2 +- Change License string to "ASL 2.0" instead of "Apache Software License" +- Disable debug files with "--enable-debug=no" (BZ #427013) + +* Mon Mar 24 2008 Rex Dieter - 1.10-1 +- alpine-1.10 +- cosmetic (Build)Req cleanup + +* Tue Feb 19 2008 Fedora Release Engineering - 1.00-3 +- Autorebuild for GCC 4.3 + +* Sat Dec 22 2007 Rex Dieter 1.00-2 +- --with-system-pinerc=%%_sysconfdir/pine.conf + --with-system-fixed-pinerc=%%_sysconfdir/pine.conf.fixed (#426512) + +* Fri Dec 21 2007 Rex Dieter 1.00-1 +- alpine-1.00 + +* Tue Dec 04 2007 Patrick "Jima" Laughton 0.99999-4 +- Bump-n-build for openldap/openssl soname changes + +* Thu Nov 15 2007 Joshua Daniel Franklin 0.99999-3 +- BuildRequires aspell to make configure happy + +* Fri Nov 09 2007 Joshua Daniel Franklin 0.99999-2 +- update to latest + +* Thu Oct 25 2007 Rex Dieter 0.9999-3 +- include stock pine.conf, pine.conf.fixed + +* Fri Sep 07 2007 Joshua Daniel Franklin 0.9999-2 +- update to latest + +* Fri Aug 24 2007 Rex Dieter 0.999-3 +- EXTRACFLAGS=$RPM_OPT_FLAGS +- --with-c-client-target=lfd +- --with-passfile=.alpine.passfile +- Requires: mailcap + +* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.2 +- remove problem cc5.sol file +- integrate changes from Patrick "Jima" Laughton + +* Tue Jul 24 2007 Joshua Daniel Franklin 0.999-2.1 +- correct spec syntax, explain Conflicts tag + +* Mon Jul 23 2007 Joshua Daniel Franklin 0.999-2.0 +- initial alpine spec +- Apache Software License 2.0 From d5db804624b032c94ac824d9dca712e2a91b9ba6 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 22 Jun 2024 13:33:17 +0200 Subject: [PATCH 77/84] Use patched upstream rhbz#2187297 --- .gitignore | 1 + alpine.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0bcd086..487387a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /alpine-2.25.tar.xz /alpine-2.26.tar.xz /alpine-2.26_new_upstream.tar.xz +/alpine-2.26_patched.tar.xz diff --git a/alpine.spec b/alpine.spec index 86331af..7228bb4 100644 --- a/alpine.spec +++ b/alpine.spec @@ -11,13 +11,14 @@ Release: %autorelease License: Apache-2.0 URL: https://alpineapp.email/ -# alpine-2.26_new_upstream.tar.xz was generated from the new upstream location -# wget https://alpineapp.email/alpine/release/src/alpine-2.26.tar.xz -# mv alpine-2.26.tar.xz alpine_upstream-2.26.tar.xz +# alpine-2.26_new_patched.tar.xz was generated from the new upstream location +# wget https://alpineapp.email/alpine/patches/alpine-2.26/alpine-2.26.tar.xz +# mv alpine-2.26.tar.xz alpine_patched-2.26.tar.xz # alpine-2.26.tar.xz is slightly different between what Fedora has cached and # what is at the new upstream. The old location no longer exists # Clearly this shuffle should be removed as soon as a new release appears. -Source0: alpine-2.26_new_upstream.tar.xz +# Source0: https://alpineapp.email/alpine/patches/alpine-2.26/alpine-2.26.tar.xz +Source0: alpine-2.26_patched.tar.xz Source1: README.fedora Patch1: alpine-2.24-useragent.patch diff --git a/sources b/sources index 07025d7..cca011a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alpine-2.26_new_upstream.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2 +SHA512 (alpine-2.26_patched.tar.xz) = e6c14f76bfa78d8d9295a80c6c98d0f6dc8c4d2fd70eac6c8cbd4454055d7a36911c0daf038dd4ff845adedaeff04cad80d3d150a0bd5c2902dca5ad5f563add From dbd9d4a8214072cc3a1e6e0062877bde8b2b87b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 Jul 2024 11:46:56 +0200 Subject: [PATCH 78/84] Fix the date stamp recorded in sources to $SOURCE_DATE_EPOCH The builds were irreproducible because `date` was used to insert the timestamp into alpine/date.c. Use --utc to ignore the local time zone setting (if any) and --date=@$SOURCE_DATE_EPOCH to clamp the time to the "official build time". (Use of $SOURCE_DATE_EPOCH is made optional. It'll be set in normal rpm builds, but allow it to not be set, so the spec file still works even if built with 'rpmbuild -ba' or such.) --- alpine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine.spec b/alpine.spec index 7228bb4..53e6f59 100644 --- a/alpine.spec +++ b/alpine.spec @@ -95,6 +95,7 @@ touch imap/ip6 --enable-debug=no \ --without-tcl \ --with-c-client-target=lfd \ + --with-date-stamp="$(date --utc ${SOURCE_DATE_EPOCH:+--date=@${SOURCE_DATE_EPOCH}})" \ --with-smtp-msa=/usr/sbin/sendmail \ --with-npa=/usr/bin/inews \ --with-passfile=.alpine.passfile \ From 7597de9d05d8208cc36ae3ebd45ba6252c06dab2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:52:20 +0000 Subject: [PATCH 79/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 19fded287ff9673d1c39781825f77eb487cd9b09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:53:46 +0000 Subject: [PATCH 80/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 399a2d8e9a2a47b0047feb8e7717b72087c25e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:52:54 +0100 Subject: [PATCH 81/84] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- alpine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine.spec b/alpine.spec index 53e6f59..ac14b46 100644 --- a/alpine.spec +++ b/alpine.spec @@ -60,6 +60,7 @@ Requires: /usr/sbin/sendmail BuildRequires: gcc BuildRequires: make +BuildRequires: libxcrypt-devel %description Alpine -- an Alternatively Licensed Program for Internet From 66775c8356e63d99c2254fe8db085640755d27ed Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 5 Mar 2025 20:00:30 +0100 Subject: [PATCH 82/84] Use C17 gcc standard. rhbz#2336274 , rhbz#2339882 Use C17 standard for now to buy some time. --- alpine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/alpine.spec b/alpine.spec index ac14b46..61e189b 100644 --- a/alpine.spec +++ b/alpine.spec @@ -91,6 +91,11 @@ install -m644 -p %{SOURCE1} . %build touch imap/ip6 + +# Add -std=gnu17 for now. +# https://bugzilla.redhat.com/show_bug.cgi?id=2336274 +CFLAGS="%{optflags} -std=gnu17" + # --without-tcl disables the TCL-based CGI "Web Alpine" %configure \ --enable-debug=no \ @@ -108,7 +113,7 @@ touch imap/ip6 # Build single threaded, make is not creating directories in time. export RPM_BUILD_NCPUS=1 -%make_build EXTRACFLAGS="$RPM_OPT_FLAGS" +%make_build %install From bf7af05717216c28bd2f86ee316eaa88620f982f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:54:52 +0000 Subject: [PATCH 83/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0a147f516a62fad997510991eb488fe0bcd32016 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:36:25 +0000 Subject: [PATCH 84/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild