diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..487387a --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/alpine-2.21.tar.xz +/alpine-2.22.tar.xz +/alpine-2.23.tar.xz +/alpine-2.24.tar.xz +/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/Makefile b/Makefile deleted file mode 100644 index 19cd451..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alpine -# $Id$ -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 -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/README.fedora b/README.fedora new file mode 100644 index 0000000..033ea65 --- /dev/null +++ b/README.fedora @@ -0,0 +1,26 @@ + += mlock = +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}[], + +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-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-2.24-useragent.patch b/alpine-2.24-useragent.patch new file mode 100644 index 0000000..f68f911 --- /dev/null +++ b/alpine-2.24-useragent.patch @@ -0,0 +1,42 @@ +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/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-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 new file mode 100644 index 0000000..61e189b --- /dev/null +++ b/alpine.spec @@ -0,0 +1,147 @@ +# 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.26 +Release: %autorelease + +License: Apache-2.0 +URL: https://alpineapp.email/ + +# 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: 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 +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 +# functionality such as non-ASCII encoded saved passwords. Additionally, there +# are also many patches to pine floating around that for political/technical +# reasons will not be integrated into alpine. (I'd like to stay out of it... +# just search "Mark Crispin maildir" for the gory details.) Since licensing +# prevents a Fedora pine package, I cannot predict what patches users might +# have and so want to warn them instead of automatically replacing their pine +# install with an alpine that could break their configuration. +# I understand this to be a special case of the "Optional Functionality" +# description at http://fedoraproject.org/wiki/Packaging/Conflicts +Conflicts: pine + +Provides: re-alpine = %{version}-%{release} + +#BuildRequires: automake libtool +BuildRequires: gettext +BuildRequires: hunspell +## 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 +# passing --with-smtp-msa=/usr/sbin/sendmail instead +#BuildRequires: /usr/sbin/sendmail + +Requires: hunspell +Requires: mailcap +Requires: /usr/sbin/sendmail + +BuildRequires: gcc +BuildRequires: make +BuildRequires: libxcrypt-devel + +%description +Alpine -- an Alternatively Licensed Program for Internet +News & Email -- is a tool for reading, sending, and managing +electronic messages. Alpine is the successor to Pine and was +developed by Computing & Communications at the University of +Washington. + Though originally designed for inexperienced email users, +Alpine supports many advanced features, and an ever-growing number of +configuration and personal-preference options. +Changes and enhancements over pine: + * Released under the Apache Software License, Version 2.0. + * Internationalization built around new internal Unicode support. + * Ground-up reorganization of source code around new "pith/" core +routine library. + * Ground-up reorganization of build and install procedure based on +GNU Build System's autotools. + + +%prep +%setup -q -n alpine-%{version} +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 + +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 \ + --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 \ + --with-simple-spellcheck=hunspell \ + --with-interactive-spellcheck=hunspell \ + --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 + + +%install +%make_install + +# create/touch %ghost'd files +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed + + +%files +%doc README +%doc README.fedora +%license LICENSE +%ghost %config(noreplace) %{_sysconfdir}/pine.conf +%ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed +%{_bindir}/alpine +%{_bindir}/pico +%{_bindir}/pilot +%{_bindir}/rpload +%{_bindir}/rpdump +%{_mandir}/man1/alpine.1* +%{_mandir}/man1/pico.1* +%{_mandir}/man1/pilot.1* +%{_mandir}/man1/rpload.1* +%{_mandir}/man1/rpdump.1* + + +%changelog +%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 diff --git a/sources b/sources index e69de29..cca011a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (alpine-2.26_patched.tar.xz) = e6c14f76bfa78d8d9295a80c6c98d0f6dc8c4d2fd70eac6c8cbd4454055d7a36911c0daf038dd4ff845adedaeff04cad80d3d150a0bd5c2902dca5ad5f563add