From e7a6618fa44f30bc4a4c5337067d9da582a3f6401d8f560e08b6ed1057496342 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 26 Apr 2008 09:25:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=4 --- adhere-to-prototypes.diff | 11 ------ alpine-1.00.tar.bz2 | 3 -- alpine-1.10.tar.lzma | 3 ++ alpine.changes | 5 +++ alpine.spec | 65 +++++++++++++------------------ chappa-cherrypick.sh | 49 +++++++++++++---------- chappa-patches.tar.bz2 | 3 -- chappa-patches.tar.lzma | 3 ++ hide-release_number-in-titlebar.c | 30 ++++++++++++++ support-long-version.diff | 32 --------------- 10 files changed, 97 insertions(+), 107 deletions(-) delete mode 100644 adhere-to-prototypes.diff delete mode 100644 alpine-1.00.tar.bz2 create mode 100644 alpine-1.10.tar.lzma delete mode 100644 chappa-patches.tar.bz2 create mode 100644 chappa-patches.tar.lzma create mode 100644 hide-release_number-in-titlebar.c delete mode 100644 support-long-version.diff diff --git a/adhere-to-prototypes.diff b/adhere-to-prototypes.diff deleted file mode 100644 index a0ca51b..0000000 --- a/adhere-to-prototypes.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- alpine-0.999/imap/src/mlock/mlock.c 2006-08-31 02:21:48.000000000 +0000 -+++ alpine-0.999.fixed/imap/src/mlock/mlock.c 2007-07-31 23:30:08.000000000 +0000 -@@ -40,6 +40,8 @@ - #include - #include - #include -+#include -+#include - - #define LOCKTIMEOUT 5 /* lock timeout in minutes */ - #define LOCKPROTECTION 0775 diff --git a/alpine-1.00.tar.bz2 b/alpine-1.00.tar.bz2 deleted file mode 100644 index 990a32a..0000000 --- a/alpine-1.00.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a832aacb7a6c005ea51e09bb9a4ea33b2afc029f9b65d34a83a2eef4d3c842d -size 4792104 diff --git a/alpine-1.10.tar.lzma b/alpine-1.10.tar.lzma new file mode 100644 index 0000000..6ea4f0e --- /dev/null +++ b/alpine-1.10.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12a0b4ca8e658e3db4d1b3532aa7e7fb2a83e713b76772cc09d2815e05047972 +size 3773431 diff --git a/alpine.changes b/alpine.changes index 7ea7594..bd8c5b6 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 25 14:40:15 CEST 2008 - bk@suse.de + +- Update to alpine-1.10 and update fixes suggested for this version + ------------------------------------------------------------------- Fri Jan 11 17:04:18 CET 2008 - bk@suse.de diff --git a/alpine.spec b/alpine.spec index b659525..4915ed1 100644 --- a/alpine.spec +++ b/alpine.spec @@ -1,5 +1,5 @@ # -# spec file for package alpine (Version 1.00) +# spec file for package alpine (Version 1.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -9,6 +9,7 @@ # + Name: alpine # # Package configuration: @@ -25,10 +26,11 @@ Name: alpine # 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 ncurses-devel openldap2-devel openssl-devel pam-devel update-desktop-files +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 @@ -45,7 +47,7 @@ Provides: pine4 Conflicts: pine4 %endif # -Version: 1.00 +Version: 1.10 Release: 1 License: The Apache Software License Group: Productivity/Networking/Email/Clients @@ -56,13 +58,11 @@ Url: http://www.washington.edu/alpine/ # from the distributed source tarball: # %define USE_CLEANED_UP_TARBALL_FORBUILD 1 -%if %USE_CLEANED_UP_TARBALL_FORBUILD != 1 -Source: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.bz2 -%else +%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.bz2 - bunzip2 %{name}-%{version}-build.tar.bz2 + 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 # -# needs patch103 to support it, sets version to e.g. to "0.9999-openSUSE-7": -# -%patch103 -p1 -echo %{version}-openSUSE-%{release} >VERSION -# # People which want, can use the full all.patch.gz with apply_all_in_one_patch: # %if %{apply_all_in_one_patch} @@ -240,8 +232,8 @@ LDFLAGS="$LDFLAGS $EXTRALDFLAGS" --with-password-prog=/usr/bin/passwd \ --with-npa=/usr/bin/inews \ --with-spellcheck-prog="please set Speller to eg. 'aspell -c' in SETUP/Configuration"\ - --with-system-pinerc=/etc/pine.conf \ - --with-system-fixed-pinerc=/etc/pine.conf.fixed \ + --with-system-pinerc=%_sysconfdir/pine.conf \ + --with-system-fixed-pinerc=%_sysconfdir/pine.conf.fixed \ --with-debug-level=0 \ --with-debug-files=2 \ --with-file=.alpine-debug \ @@ -338,11 +330,6 @@ fi %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -: 'Expect those rpmlint warnings: The resulting binaries are not packaged:' -: 'W: alpine uninitialized-variable dmail.c: 435' -: 'W: alpine uninitialized-variable tmail.c: 531' -: 'This warning is invalid, gcc is wrong here:' -: 'W: alpine uninitialized-variable string.c: 421' %files %defattr(-, root, root) @@ -372,17 +359,19 @@ fi %endif %changelog -* Fri Jan 11 2008 - bk@suse.de +* Fri Apr 25 2008 bk@suse.de +- Update to alpine-1.10 and update fixes suggested for this version +* Fri Jan 11 2008 bk@suse.de - Update to alpine-1.00 and apply fixes suggested for this version -* Tue Sep 25 2007 - bk@suse.de +* Tue Sep 25 2007 bk@suse.de - Use only select patches from Eduardo (fixes crash in mail reader) -* Wed Sep 19 2007 - bk@suse.de +* Wed Sep 19 2007 bk@suse.de - Remove files with unclear license from packaged sources (#308533) - Add small bug fix: Postponed messages which were labelled as UTF-8 - Spec file cleanup: Comments improved, obsoleted some warning flags -* Tue Sep 04 2007 - bk@suse.de +* Tue Sep 04 2007 bk@suse.de - Update to final prerelease 0.9999 with updates from Eduardo Chappa -* Thu Aug 09 2007 - bk@suse.de +* Thu Aug 09 2007 bk@suse.de - add a number of critcally needed fixes for some crashes (and more) -* Thu Aug 02 2007 - bk@suse.de +* Thu Aug 02 2007 bk@suse.de - initial version 0.999 + assorted feature patches and some fixes diff --git a/chappa-cherrypick.sh b/chappa-cherrypick.sh index d63a012..9e71c52 100644 --- a/chappa-cherrypick.sh +++ b/chappa-cherrypick.sh @@ -24,6 +24,7 @@ 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! @@ -51,6 +52,7 @@ END 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 @@ -58,7 +60,7 @@ print_which_shall_be_packaged() { WrtAcc|fancy|maildir|colortext|insertpat|[ors]*bug|*crash) : 'really wanted' echo "$name";; - utf8bug|ignoresize|searchheader) + utf8bug|digestbug|ignoresize|searchheader) : 'also wanted' echo "$name";; unverified) @@ -92,7 +94,7 @@ print_which_shall_be_packaged() { #print_which_shall_be_packaged #exit get_patch_path() { - echo staff.washington.edu/chappa/alpine/patches/alpine-1.00/$1.patch.gz + echo staff.washington.edu/chappa/alpine/patches/alpine-$version/$1.patch.gz } list_packaged_patches_urls() { print_which_shall_be_packaged | while read name rest; do @@ -114,7 +116,7 @@ update_OTHERS_section() { rm change echo "OTHERS_section updated, restarting from scratch!" cd .. - exec bash $0 --update + exec bash $0 --update $2 else echo "OTHERS_section updated, please check and do it." exit @@ -123,6 +125,7 @@ update_OTHERS_section() { rm change } check_patch_list() { + missing= for name in `ls $chappa_patchdir` do helpentry=`echo_patch_help | sed -n "s/^$name //p"` @@ -179,20 +182,25 @@ update_packaged_patches() { done find $chappa_patchdir -name '*.hlp' -size 0|xargs --no-run-if-empty rm cd - - tar xvfj $chappa_patchdir.tar.bz2 + lzma -dc $chappa_patchdir.tar.lzma | tar xvf - diff -r $chappa_patchdir test/$chappa_patchdir | less - echo -n 'Changes OK, update $chappa_patchdir.tar.bz2 (y/*)? ' + echo -n 'Changes OK, update $chappa_patchdir.tar.lzma (y/*)? ' read answer if [ "$answer" = y ]; then cd test - tar cfj ../$chappa_patchdir.tar.bz2 $chappa_patchdir - cd - - tar tfvj $chappa_patchdir.tar.bz2 | sort +5 + 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.bz2 NO updated!" + echo "$chappa_patchdir.tar.lzma NOT updated!" fi } if [ "$1" = "--update" ]; then + set -eu + version=$2 update_packaged_patches exit fi @@ -202,7 +210,7 @@ if [ "$1" = "--cleanup" ]; then fi # Everything above is only for update and cleanup if [ "$1" != "--apply" ]; then - echo "cherrypick.sh can either update $chappa_patchdir.tar.bz2, cleanup or apply the patches" + echo "cherrypick.sh can either update $chappa_patchdir.tar.lzma, cleanup or apply the patches" echo "usage: cherrypick [ --update | --cleanup | --apply ]" exit 5 fi @@ -211,13 +219,13 @@ if [ "$0" -nt "$2" ]; then $0 is newer than $2 -If the update of ${0##*/} needs to change $chappa_patchdir.tar.bz2, you should run: +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.bz2 +touch -r chappa-cherrypick.sh chappa-patches.tar.lzma " exit 4 fi @@ -318,16 +326,17 @@ 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 the ENTER key while the link above is hightlighted for more information. -

New in Alpine

- - Version ++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 @@ -344,7 +353,7 @@ cat < END } -tar xvfj $2 +lzma -dc $2 | tar xf - if generate_help_patch | patch -p1; then echo "generated patch applied" else diff --git a/chappa-patches.tar.bz2 b/chappa-patches.tar.bz2 deleted file mode 100644 index 93d340c..0000000 --- a/chappa-patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bd03b73c8547a9151d7b513acfccd4616202bb6c7955cc2bae05d6d27a9b0cd -size 62808 diff --git a/chappa-patches.tar.lzma b/chappa-patches.tar.lzma new file mode 100644 index 0000000..2118787 --- /dev/null +++ b/chappa-patches.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad20ea88820770b921762c84f2b9cb0f9336ebd1a1b8bad1d279be6a43dbbb9e +size 60153 diff --git a/hide-release_number-in-titlebar.c b/hide-release_number-in-titlebar.c new file mode 100644 index 0000000..9d823bc --- /dev/null +++ b/hide-release_number-in-titlebar.c @@ -0,0 +1,30 @@ +# 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/support-long-version.diff b/support-long-version.diff deleted file mode 100644 index ef1b968..0000000 --- a/support-long-version.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- alpine-0.999/pith/state.h 2007/08/08 18:35:37 1.1 -+++ alpine-0.999/pith/state.h 2007/08/08 18:36:06 -@@ -98,8 +98,8 @@ - SP_S s_pool; /* stream pool */ - - char inbox_name[MAXFOLDER+1]; -- char pine_pre_vers[10]; /* highest version previously run */ -- char vers_internal[10]; -+ char pine_pre_vers[20]; /* highest version previously run */ -+ char vers_internal[20]; - - MAILSTREAM *mail_stream; /* ptr to current folder stream */ - MSGNO_S *msgmap; /* ptr to current message map */ ---- alpine-0.999/pith/conf.c 2007/08/08 18:27:29 1.1 -+++ alpine-0.999/pith/conf.c 2007/08/08 18:34:59 -@@ -2330,9 +2330,14 @@ - && ps->vers_internal[1] == '.' - && isdigit((unsigned char)ps->vers_internal[2]) - && isdigit((unsigned char)ps->vers_internal[3]) -- && isalpha((unsigned char)ps->vers_internal[4]) -- && strncmp(VAR_LAST_VERS_USED, ps->vers_internal, 4) >= 0)){ -+ && isdigit((unsigned char)ps->vers_internal[4]) -+ && ps->vers_internal[5] == '-' -+ && strncmp(VAR_LAST_VERS_USED, ps->vers_internal, 5) >= 0)){ - ps->show_new_version = 0; -+ /* But if the version string changed at all, update config */ -+ if (strcmp(VAR_LAST_VERS_USED, ps->vers_internal)) -+ set_variable(V_LAST_VERS_USED, ps->vers_internal, 1, 1, -+ ps_global->ew_for_except_vars); - } - /* Otherwise just do lexicographic comparision... */ - else if(VAR_LAST_VERS_USED