From c4e1997672f55c5fd6eb97d5ce1a5499ca6d7904d9c8f1cd549fc73c9ca4ebfb Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 29 Sep 2008 16:30:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=6 --- alpine-1.10.tar.lzma | 3 - alpine-2.00.tar.bz2 | 3 + alpine.changes | 21 ++ alpine.spec | 151 ++++++------ chappa-WrtAcc.patch.gz | 3 + chappa-cherrypick.sh | 374 ------------------------------ chappa-colortext.patch.gz | 3 + chappa-fancy.patch.gz | 3 + chappa-ignoresize.patch.gz | 3 + chappa-insertpat.patch.gz | 3 + chappa-maildir.patch.gz | 3 + chappa-patches.tar.lzma | 3 - chappa-searchheader.patch.gz | 3 + hide-release_number-in-titlebar.c | 30 --- pine-nonvoid-function.patch | 10 + 15 files changed, 133 insertions(+), 483 deletions(-) delete mode 100644 alpine-1.10.tar.lzma create mode 100644 alpine-2.00.tar.bz2 create mode 100644 chappa-WrtAcc.patch.gz delete mode 100644 chappa-cherrypick.sh create mode 100644 chappa-colortext.patch.gz create mode 100644 chappa-fancy.patch.gz create mode 100644 chappa-ignoresize.patch.gz create mode 100644 chappa-insertpat.patch.gz create mode 100644 chappa-maildir.patch.gz delete mode 100644 chappa-patches.tar.lzma create mode 100644 chappa-searchheader.patch.gz delete mode 100644 hide-release_number-in-titlebar.c create mode 100644 pine-nonvoid-function.patch diff --git a/alpine-1.10.tar.lzma b/alpine-1.10.tar.lzma deleted file mode 100644 index 6ea4f0e..0000000 --- a/alpine-1.10.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12a0b4ca8e658e3db4d1b3532aa7e7fb2a83e713b76772cc09d2815e05047972 -size 3773431 diff --git a/alpine-2.00.tar.bz2 b/alpine-2.00.tar.bz2 new file mode 100644 index 0000000..7384f52 --- /dev/null +++ b/alpine-2.00.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 +size 5222673 diff --git a/alpine.changes b/alpine.changes index 9cd602f..ab53cf5 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Sep 29 17:23:42 CEST 2008 - max@suse.de + +- Update to version 2.00 and the related Chappa patches. +- Changes include: + * Experimental S/MIME support added in UNIX versions of Alpine + * Enhance address completion in the composer (TAB command) + * Add line wrapping when displaying PRE formatted sections of + HTML + * Fix a crash when using tab-completion for selecting a Save + filename + * Fix viewing, printing, exporting, replying, and bouncing of + message digests. + * The Unknown Character Set option did not work correctly + interpreting unknown characters in message headers + * Crash when TABing to next folder, the next folder with new + mail is a POP folder, and there is a more than 10 minute + pause between typing the TAB and typing the Yes +- For more details, see: + http://www.washington.edu/alpine/changes/1.10-to-2.00.html + ------------------------------------------------------------------- Sat Apr 26 14:18:40 CEST 2008 - coolo@suse.de diff --git a/alpine.spec b/alpine.spec index 56da535..f8187fe 100644 --- a/alpine.spec +++ b/alpine.spec @@ -1,10 +1,17 @@ # -# spec file for package alpine (Version 1.10) +# spec file for package alpine (Version 2.00) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -21,19 +28,14 @@ Name: alpine %define obsolete_pine 0 %define provide_pico_and_pilot 0 %endif -%define build_alpined 0 # # For debugging only: %define use_mudflap 0 %define build_vanilla 0 -# Set this if you want to apply Eduardo Chappa's patches.all.gz: -%define apply_all_in_one_patch 0 # -Summary: Alpine mail user agent -BuildRequires: imap-devel krb5-devel libgssapi lzma ncurses-devel openldap2-devel openssl-devel pam-devel update-desktop-files -%if %build_alpined -BuildRequires: blt tcl-devel -%endif +Summary: Alpine mail user agent (formerly pine) +BuildRequires: imap-devel krb5-devel libgssapi lzma ncurses-devel +BuildRequires: openldap2-devel openssl-devel pam-devel update-desktop-files %if %{use_mudflap} BuildRequires: libmudflap %endif @@ -47,39 +49,17 @@ Provides: pine4 Conflicts: pine4 %endif # -Version: 1.10 -Release: 2 +Version: 2.00 +Release: 1 License: The Apache Software License Group: Productivity/Networking/Email/Clients AutoReqProv: on Url: http://www.washington.edu/alpine/ -# -# Fix for #308533: Remove files with unclear license, which are not needed -# from the distributed source tarball: -# -%define USE_CLEANED_UP_TARBALL_FORBUILD 1 -%if %USE_CLEANED_UP_TARBALL_FORBUILD == 1 -#This caret is only here to prevent confusing spec file checking tools: -#%( - cd %{_sourcedir};cp %{name}-%{version}{,-build}.tar.lzma - lzma -d %{name}-%{version}-build.tar.lzma - tar --delete --file=%{name}-%{version}-build.tar \ - ./%{name}-%{version}/pico/msmem.c ./%{name}-%{version}/imap/docs - echo >%{name}-%{version}.README.SUSE <compile-warnings-allowed.log fi # -# People which want, can use the full all.patch.gz with apply_all_in_one_patch: +# "Chappa" patches # -%if %{apply_all_in_one_patch} -%patch500 -p1 -%else -sh %{SOURCE600} --apply %{SOURCE601} -%endif +%patch600 -p1 +%patch601 -p1 +%patch602 -p1 +%patch603 -p1 +%patch604 -p1 +%patch605 -p1 +%patch606 -p1 # # SuSE patches - warning fixes, etc: # -%patch1 -p1 +%patch1 %patch2 -p1 %patch3 -p1 %patch10 -p1 @@ -180,7 +173,7 @@ sh %{SOURCE600} --apply %{SOURCE601} # export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \ %if %{suse_version} >= 1010 - -Wno-unused-value -Wno-strict-aliasing -Wno-pointer-sign -Wno-unused \ + -Wno-unused-value -fno-strict-aliasing -Wno-pointer-sign -Wno-unused \ %endif %if %{suse_version} >= 1030 -Wno-address \ @@ -221,7 +214,7 @@ export EXTRALDFLAGS="-lmudflap" LDFLAGS="$LDFLAGS $EXTRALDFLAGS" %endif : -%configure --with-tcl-lib=tcl8.4 \ +%configure \ %if %{use_mudflap} %( : 'mudflap(th) does not work with with threads:' )\ --without-pthread \ @@ -236,6 +229,7 @@ LDFLAGS="$LDFLAGS $EXTRALDFLAGS" --with-debug-files=2 \ --with-file=.alpine-debug \ --with-default-mail-directory=Mail \ + --with-web-bin=%_libdir/%name \ --with-passfile=.pinepw || { grep -B9 -A20 'failed program was' config.log | grep -A24 checking exit 5 @@ -243,22 +237,15 @@ LDFLAGS="$LDFLAGS $EXTRALDFLAGS" # # imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS: # -make EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" 2>&1 | tee make.log | - grep -v -e '^mv ' -e '/usr/bin/[a-z]*' -e '^echo ' -e ' -l' | - sed 's/.*gcc .* -o .*\.o /-----> /;/^-----/s/;.*//;/^then/d' +make %{?jobs:-j%jobs} EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" %install -install -D -m755 alpine/alpine $RPM_BUILD_ROOT%{_bindir}/alpine -: +make install DESTDIR=%buildroot # # When called as alpinef, alpine uses function keys instead of Control keys: # ln $RPM_BUILD_ROOT%{_bindir}/alpine $RPM_BUILD_ROOT%{_bindir}/alpinef -: -install -m755 alpine/{rpload,rpdump} $RPM_BUILD_ROOT%{_bindir} install -m755 imap/mailutil/mailutil $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -install -m644 doc/{alpine.1,rpdump.1,rpload.1} $RPM_BUILD_ROOT%{_mandir}/man1/ install -m644 imap/src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%name.desktop @@ -327,14 +314,14 @@ if [ -s %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log ]; then fi %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf %buildroot %files %defattr(-, root, root) -%doc %{_mandir}/man1/alpine.1.gz -%doc %{_mandir}/man1/rpdump.1.gz -%doc %{_mandir}/man1/rpload.1.gz -%doc %{_mandir}/man1/mailutil.1.gz +%doc %{_mandir}/man1/alpine.* +%doc %{_mandir}/man1/rpdump.* +%doc %{_mandir}/man1/rpload.* +%doc %{_mandir}/man1/mailutil.* %doc README NOTICE LICENSE %doc doc/mailcap.unx doc/mime.types doc/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine @@ -348,15 +335,33 @@ fi %files -n pico %defattr(-, root, root) %{_bindir}/pico -%doc %{_mandir}/man1/pico.1.gz +%doc %{_mandir}/man1/pico.* %files -n pilot %defattr(-, root, root) %{_bindir}/pilot -%doc %{_mandir}/man1/pilot.1.gz +%doc %{_mandir}/man1/pilot.* %endif %changelog +* Mon Sep 29 2008 max@suse.de +- Update to version 2.00 and the related Chappa patches. +- Changes include: + * Experimental S/MIME support added in UNIX versions of Alpine + * Enhance address completion in the composer (TAB command) + * Add line wrapping when displaying PRE formatted sections of + HTML + * Fix a crash when using tab-completion for selecting a Save + filename + * Fix viewing, printing, exporting, replying, and bouncing of + message digests. + * The Unknown Character Set option did not work correctly + interpreting unknown characters in message headers + * Crash when TABing to next folder, the next folder with new + mail is a POP folder, and there is a more than 10 minute + pause between typing the TAB and typing the Yes +- For more details, see: + http://www.washington.edu/alpine/changes/1.10-to-2.00.html * Sat Apr 26 2008 coolo@suse.de - fix build * Fri Apr 25 2008 bk@suse.de diff --git a/chappa-WrtAcc.patch.gz b/chappa-WrtAcc.patch.gz new file mode 100644 index 0000000..27f59a2 --- /dev/null +++ b/chappa-WrtAcc.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1884da3a57396eeb664281c48760d0c508fc51fb9af760c2dd125952cc25eab7 +size 2576 diff --git a/chappa-cherrypick.sh b/chappa-cherrypick.sh deleted file mode 100644 index 9e71c52..0000000 --- a/chappa-cherrypick.sh +++ /dev/null @@ -1,374 +0,0 @@ -# abort on any error: -set -e -# Used by --update and --apply: -chappa_patchdir=chappa-patches -echo_others() { - # Note: This function is updated by the function update_OTHERS_section, it's - # very sensitive to change, the part below must stay as it is or - # you will loose this script in the update process if you say "y": -cat<author's patch web page. -OTHERS -} -echo_patch_help() { - cat <(more...) -maildir Maildir Patch. (more...) -fillpara Pine justifies paragraphs with more than one level of indentation. (more...) -rules Rules patch, to make Pine flexible. (more...) -compose Send mail from the command line. -WrtAcc Write accents like á, é, ñ etc. -circtab Tab check folders on cycles. (more...) -count Get the number of new messages when opening a folder. -insertpat Reinsert the pattern you searched for last. -patchlevel Shows the patchlevel of alpine -picoreplacecrash Fix a bug that makes Pico crash in the replace command -replacebug Fix a bug in Pico which makes it not update the screen -digestbug Fix a bug that makes Alpine not display digests -stuffingbug Fix a bug that makes Alpine add spaces to flowed text messages -reply New Reply command menu.(more...) -fromheader Change your From header without any effort! -composeurl Choose a role when composing a message from a mailto: link. -colortext Paint special text in the body of the message in any custom color. (more...) -searchheader Select messages by the content of an arbitrary header. -DelText Delete until the the end of a file, or message (press ^W^X). -quota Get the QUOTA information from an IMAP server (if such server supports e QUOTA command). -help Get the internal name of a help topic to use it with a x-pine-help URL scheme. -ignoresize Decide if you want to ignore errors in size changes of a message when saving a message from an IMAP server. -status Fix the update of the status line information in pico -unverified Fix a bug that makes Alpine not to give a warning if the Newsgroup header is present -utf8bug Fix a bug that makes Alpine filter incorrectly in the UTF-8 filter. -END - echo_others -} -#================================================================================== -# The following functions are only used for --update: -# -# -# This function decided which patches are downloaded, and packaged: -# Every patch which shall be, is echoed, every patch which shall be not is not. -# If it encounters a new patch, it is printed on stderror -# -print_which_shall_be_packaged() { - #grep '"info/' index.html | sed 's/.LI.\(.*\)<.*NAME="\([^"]*\)".*/\2 \1/'| - wget -m http://staff.washington.edu/chappa/alpine/readme/README.upgrade >&2 - error_out= - while read name text - do - case "$name" in - cygwin|all|windows) : 'always ignored';; - WrtAcc|fancy|maildir|colortext|insertpat|[ors]*bug|*crash) - : 'really wanted' - echo "$name";; - utf8bug|digestbug|ignoresize|searchheader) - : 'also wanted' - echo "$name";; - unverified) - : 'also wanted' - echo "$name";; - rules) : 'conflicts with others and would need extra work' - #echo "$name" - ;; - help|status|reply|DelText|outgoing|count) - : 'not important enough';; - quota|composeurl|fromheader|circtab) - : 'rather not';; - patchlevel) - : 'lets see';; - marksmtpbug) - : 'not found';; - fillpara) - : 'rather dangerous';; - password|'#') - : 'internal';; - - *) error_out=1;echo NEW $name;; - esac - done ,//;s/ Posted.*//;s/which fixes/Fix/;s/which changes/Change/;s/which adds/Add/' \ - >others - sed '/^cat..OTHERS$/,/^OTHERS$/{/^cat..OTHERS$/b ins;/^OTHERS/p;d};p;d;:ins;r others' ../$0 >change - diff ../$0 change || { - echo -n "DANGEROUS may loose script work: Apply these changes to $0 (y/*)?" - read answer - if [ "$answer" = y ]; then - cat change >../$0 - rm change - echo "OTHERS_section updated, restarting from scratch!" - cd .. - exec bash $0 --update $2 - else - echo "OTHERS_section updated, please check and do it." - exit - fi - } - rm change -} -check_patch_list() { - missing= - for name in `ls $chappa_patchdir` - do - helpentry=`echo_patch_help | sed -n "s/^$name //p"` - printf "%-22s %s\n" $name "'$helpentry'" - if [ -z "$helpentry" ]; then - missing="$missing $name" - fi - done - if [ "$missing" ]; then - echo "=======> help entries for $missing are missing, existing - please fix!" - exit 4 - else - echo "---> No help entries are missing" >&2 - fi -} - -update_packaged_patches() { - mkdir -p test;cd test - do_update=true - print_which_shall_be_packaged || exit - #do_update=false - if $do_update;then - update_OTHERS_section - rm -f index.html - wget http://staff.washington.edu/chappa/alpine/ - wget -m $(list_packaged_patches_urls) - fi - #print_which_shall_be_packaged | sed 's/.*/^& /' >shall-be-packaged.patterns - #grep '"info/' index.html | sed 's/.LI.\(.*\)<.*NAME="\([^"]*\)".*/\2 \1/'| - # grep -f shall-be-packaged.patterns | sed 's/[^ ]* //' >patch-summaries.txt - - rm -rf $chappa_patchdir - mkdir $chappa_patchdir - print_which_shall_be_packaged | while read name rest; do - if [ "$name" = NEW: ]; then - exit - fi - zcat `get_patch_path $name` >$chappa_patchdir/$name - touch -r `get_patch_path $name` $chappa_patchdir/$name - done - check_patch_list - print_which_shall_be_packaged | while read name rest; do - if echo_patch_help | sed -n "s/^$name //p"| grep HREF; then - : - else - wget --timestamping -x http://staff.washington.edu/chappa/alpine/info/$name.html || : - if [ -s staff.washington.edu/chappa/alpine/info/$name.html ]; then - sed '0,/is available for version/d;/\/'$name'.patch/d;/<.[tT][dD]><.[tT][rR]><.[tT][aA][bB][lL][eE]>/,$d' \ - staff.washington.edu/chappa/alpine/info/$name.html | - iconv -f latin1 -t UTF-8 >$chappa_patchdir/$name.hlp - fi - fi - zcat `get_patch_path $name` >$chappa_patchdir/$name - done - find $chappa_patchdir -name '*.hlp' -size 0|xargs --no-run-if-empty rm - cd - - lzma -dc $chappa_patchdir.tar.lzma | tar xvf - - diff -r $chappa_patchdir test/$chappa_patchdir | less - echo -n 'Changes OK, update $chappa_patchdir.tar.lzma (y/*)? ' - read answer - if [ "$answer" = y ]; then - cd test - tar cf ../$chappa_patchdir.tar $chappa_patchdir - cd .. - tar tfv $chappa_patchdir.tar | sort +5 - echo "Compressing using lzma..." - old chappa-patches.tar.lzma - lzma -9 $chappa_patchdir.tar - else - echo "$chappa_patchdir.tar.lzma NOT updated!" - fi -} -if [ "$1" = "--update" ]; then - set -eu - version=$2 - update_packaged_patches - exit -fi -if [ "$1" = "--cleanup" ]; then - rm -rf test - exit -fi -# Everything above is only for update and cleanup -if [ "$1" != "--apply" ]; then - echo "cherrypick.sh can either update $chappa_patchdir.tar.lzma, cleanup or apply the patches" - echo "usage: cherrypick [ --update | --cleanup | --apply ]" - exit 5 -fi -if [ "$0" -nt "$2" ]; then - echo "Attention: -$0 is newer than -$2 - -If the update of ${0##*/} needs to change $chappa_patchdir.tar.lzma, you should run: - -sh ${0##*/} --update - -otherwise run: - -touch -r chappa-cherrypick.sh chappa-patches.tar.lzma -" - exit 4 -fi -# Everything below is only for apply, it applies all patches in $2 -# and generates a patch to pine.hlp which describes the applied patches. - -print_hlp_pages() { - ls $chappa_patchdir | while read name; do - if [ -f $chappa_patchdir/$name.hlp ]; then - title=`echo_patch_help | sed -n "s/^$name //p"` - cat < - -$title - - -

$title

-

-END - # Unlike pure html, alpine's hlp viewer needs - # backslashes escaped: - sed 's/\\/\\\\/g;s/\\\\"/\\\\\"/g' $chappa_patchdir/$name.hlp - echo '' - fi - done -} - -echo_patch_list() { - ls $chappa_patchdir | while read name; do - case "$name" in *.hlp) continue;; esac - helpentry=`echo_patch_help | sed -n "s/^$name //p"` - echo "

  • $helpentry" - if [ -f $chappa_patchdir/$name.hlp ]; then - echo " (more...)" - fi - done -} -generate_patch_help() { -( - print_hlp_pages -cat < - -Information on checking for known issues and reporting new issues - - -

    Information on checking for known issues and reporting new issues

    -

    If you have any issues while using this release of Alpine, please search -the Novell bugzilla using the advanced search form at - -http://bugzilla.novell.com/query.cgi and enter "alpine" -into the search field for "Summary". - -In order to see all issues which have been reported so far, -unselect all preselections in the Status list of the Impact Section, -by holding the Control key while clicking on NEW, ASSIGNED, NEEDINFO -an REOPENED before clicking on "Search". - -

    If your issue is not found in the Novell Bugzilla, please sign in -to the Novell Bugzilla and report the issue. - -You can also visit the -Alpine Information Center, -and the - -Alpine-alpha mailing list archive. On the - -Alpine-alpha mailing list, you can also report and discuss issues.

    -Be sure to include the full openSUSE version -of alpine (found at the top of this release notes page) in all reports -which you make. -====== h_opensuse_patches ====== - - -Information on patches added to this release - - -

    Information on patches added to this release

    -

    -This version of Alpine has been modified by including patches from - -http://staff.washington.edu/chappa/alpine/. These patches include -new features and bug fixes. More complete information on each patch -included in this version can be found in the web. - -

    If you have any problems with this release of Pine, please -follow the suggestions here - -

    The list of patches included in this release are:

      -END - echo_patch_list - echo "
    " -) -} -generate_help_patch() { - cat <University of Washington - - -+

    Note: This version of Alpine has been built for openSUSE with -+patches of Eduardo Chappa for latest bugfixes and enhanced functionality. -+Press ENTER on the link above for more information. -+ -

    - Alpine is an "Alternatively Licensed Program for Internet - News and Email" produced by the University of Washington. -END - lines=$(generate_patch_help |wc -l) - start=1171 - echo "@@ -$start,6 +`expr $start + 1`,`expr $lines + 6` @@" -cat < - -END - generate_patch_help | sed 's/^/+/' -cat < - -END -} -lzma -dc $2 | tar xf - -if generate_help_patch | patch -p1; then - echo "generated patch applied" -else - echo "generated patch failed to apply" - exit 5 -fi -rm $chappa_patchdir/*.hlp -for patch in $chappa_patchdir/*;do - echo - echo "Applying $patch" - if patch -p1 -i$patch; then - echo "$patch applied" - else - echo "$patch failed to apply" - exit 5 - fi -done -exit diff --git a/chappa-colortext.patch.gz b/chappa-colortext.patch.gz new file mode 100644 index 0000000..71d4200 --- /dev/null +++ b/chappa-colortext.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f2d2d6ff41b804530c9f17c0870fdf01018bedff1460e4b3e385d8d0124e77 +size 5440 diff --git a/chappa-fancy.patch.gz b/chappa-fancy.patch.gz new file mode 100644 index 0000000..4e125df --- /dev/null +++ b/chappa-fancy.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7830172b545015d58b4a4463aadd63450cde988f67d606e64c6559eea812b37 +size 24556 diff --git a/chappa-ignoresize.patch.gz b/chappa-ignoresize.patch.gz new file mode 100644 index 0000000..a27fba8 --- /dev/null +++ b/chappa-ignoresize.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:478b112d00d14f6f0818ff5b5de88c8c8d2f332e597382a35b5832a0ba61ceb7 +size 1745 diff --git a/chappa-insertpat.patch.gz b/chappa-insertpat.patch.gz new file mode 100644 index 0000000..6280037 --- /dev/null +++ b/chappa-insertpat.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b75adca51520eea9d5aacf092b446f583de1efc0044aacd8c4d0af964d33e34e +size 696 diff --git a/chappa-maildir.patch.gz b/chappa-maildir.patch.gz new file mode 100644 index 0000000..128224b --- /dev/null +++ b/chappa-maildir.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca0014384c83c63e6307c006b216c1e8df9a748818379c628619f307c39f0af4 +size 32098 diff --git a/chappa-patches.tar.lzma b/chappa-patches.tar.lzma deleted file mode 100644 index 2118787..0000000 --- a/chappa-patches.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad20ea88820770b921762c84f2b9cb0f9336ebd1a1b8bad1d279be6a43dbbb9e -size 60153 diff --git a/chappa-searchheader.patch.gz b/chappa-searchheader.patch.gz new file mode 100644 index 0000000..320ac90 --- /dev/null +++ b/chappa-searchheader.patch.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb69a4892f89ac794d4440c73738eb48babf794f5c0e37e4eb7c638a32ec77ff +size 1708 diff --git a/hide-release_number-in-titlebar.c b/hide-release_number-in-titlebar.c deleted file mode 100644 index 9d823bc..0000000 --- a/hide-release_number-in-titlebar.c +++ /dev/null @@ -1,30 +0,0 @@ -# Removes confusing revision number from titlebar (which is shown in the release notes anyway): ---- alpine/pith/help.c -+++ alpine/pith/help.c -@@ -96,6 +96,7 @@ - } - - -+#if 0 - char * - get_alpine_revision_number(char *buf, size_t nbuf) - { -@@ -131,6 +132,7 @@ - - return(buf); - } -+#endif - - - #ifdef DEBUG ---- alpine/alpine/titlebar.c -+++ alpine/alpine/titlebar.c -@@ -444,7 +444,7 @@ - - is_context = as.context_name ? strlen(as.context_name) : 0; - -- snprintf(version, sizeof(version), "ALPINE %s(%s)", ALPINE_VERSION, get_alpine_revision_number(revision, sizeof(revision))); -+ snprintf(version, sizeof(version), "ALPINE %s", ALPINE_VERSION); - version[sizeof(version)-1] = '\0'; - ver_len = (int) utf8_width(version); /* fixed version field width */ - diff --git a/pine-nonvoid-function.patch b/pine-nonvoid-function.patch new file mode 100644 index 0000000..bd98bab --- /dev/null +++ b/pine-nonvoid-function.patch @@ -0,0 +1,10 @@ +--- pith/filter.c ++++ pith/filter.c +@@ -6871,6 +6871,7 @@ + + gf_error("Incompatible RSS version"); + } ++ return(1); /* Is this correct? */ + } + + /*