Hello community,
here is the log from the commit of package alpine
checked in at Wed Oct 3 00:42:04 CEST 2007.
--------
--- alpine/alpine.changes 2007-09-19 21:10:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/alpine/alpine.changes 2007-09-25 13:07:42.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 25 13:05:20 CEST 2007 - bk@suse.de
+
+- Use only select patches from Eduardo (fixes crash in mail reader)
+
+-------------------------------------------------------------------
Old:
----
all.patch.bz2
alpine-upstream-postponed-sendcharset.diff
patches.diff
New:
----
chappa-cherrypick.sh
chappa-patches.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alpine.spec ++++++
--- /var/tmp/diff_new_pack.z32045/_old 2007-10-03 00:41:48.000000000 +0200
+++ /var/tmp/diff_new_pack.z32045/_new 2007-10-03 00:41:48.000000000 +0200
@@ -10,7 +10,6 @@
Name: alpine
-
#
# Package configuration:
#
@@ -20,7 +19,7 @@
# For debugging only:
%define use_mudflap 0
%define build_vanilla 0
-%define apply_all_in_one_patch 1
+%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
@@ -32,14 +31,16 @@
%endif
# pgp4pine requires pine:
Provides: pine
+#
%if %obsolete_pine
Obsoletes: pine4
Provides: pine4
%else
Conflicts: pine4
%endif
+#
Version: 0.9999
-Release: 6
+Release: 10
License: The Apache Software License
Group: Productivity/Networking/Email/Clients
AutoReqProv: on
@@ -57,17 +58,18 @@
cd %{_sourcedir};cp %{name}-%{version}{,-build}.tar.bz2
bunzip2 %{name}-%{version}-build.tar.bz2
tar --delete --file=%{name}-%{version}-build.tar \
- ./alpine-0.9999/pico/msmem.c ./alpine-0.9999/imap/docs
+ ./%{name}-%{version}/pico/msmem.c ./alpine-0.9999/imap/docs
echo >%{name}-%{version}.README.SUSE <compile-warnings-allowed.log
fi
-# Upstream patches:
-%patch200
#
-# Show that this is the openSUSE build of alpine and which version:
+# needs patch103 to support it, sets version to e.g. to "0.9999-openSUSE-7":
#
%patch103 -p1
echo %{version}-openSUSE-%{release} >VERSION
#
-# Apply Eduardo Chappa's patch set as one patch (501 documents his patch):
+# People which want, can use the full all.patch.gz with apply_all_in_one_patch:
#
%if %{apply_all_in_one_patch}
%patch500 -p1
-%patch501 -p1
+%else
+sh %{SOURCE600} --apply %{SOURCE601}
%endif
-#
-# This simply adds a colon if it's missing in the all.patch:
-#
-[ $(grep -c "including creation date of the patch is$" pith/pine.hlp) = 1 ] &&
-sed -i 's/including creation date of the patch is$/&:/' pith/pine.hlp
+#patch501 -p1
#
# SuSE patches - warning fixes, etc:
#
@@ -182,18 +173,15 @@
%patch40 -p1
%patch60 -p1
%patch90 -p1
-%endif
-#
-# End of non-vanilla-patch section
-#
+%endif # End of "if !{build_vanilla}"
%build
+# Workaround for older distros which slashed the gnu:
%if %{suse_version} <= 1010
%define _host_os %{_os}%{?_gnu}
%define _host %{_host_cpu}-%{_host_vendor}-%{_host_os}
%endif
autoreconf -fi
-export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os}"
#
# Comments on disabled warnings: The disabled warnings are rather harmless
# (If they were not, alpine would not work at all, they are trigged in mass,
@@ -201,15 +189,15 @@
# and disabling them allows one to focus on the warnings which could indicate
# real bugs. By alpine-0.9999, several warnings have been eliminated however:
#
-export CFLAGS="$CFLAGS \
+export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \
%if %{suse_version} >= 1010
--Wno-strict-aliasing -Wno-pointer-sign -Wno-unused \
+ -Wno-strict-aliasing -Wno-pointer-sign -Wno-unused \
%endif
%if %{suse_version} == 1030
--Wno-address \
+ -Wno-address \
%endif
%if %{use_mudflap}
--fmudflap -fmudflapir \
+ -fmudflap \
%endif
"
#
@@ -223,10 +211,12 @@
# -Waddress generates >100 warnings in alpine and we disabled them to
# concentrate on the really important warnings which could be real bugs better.
#
+:
#
# Used in conjunction with signal-and-panic-improvements.diff:
#
export LDFLAGS="-rdynamic" # -rdynamic is used for backtrace_symbols:
+:
#
# In case one wants to compile alpine with libmudflap to instrument all risky
# pointer/array dereferencing operations, some standard library string/heap
@@ -234,13 +224,17 @@
# Modules so instrumented should be immune to buffer overflows, invalid heap
# use, and some other classes of C/C++ programming errors. Disabled by default,
# but may be used for debugging issues which are otherwise hard to catch:
-#
+#-fmudflap -fmudflapir \
%if %{use_mudflap}
export EXTRALDFLAGS="-lmudflap"
+# Silences warnings at startup (faster, could be used for production builds):
+#export EXTRALDFLAGS="-lmudflapir"
LDFLAGS="$LDFLAGS $EXTRALDFLAGS"
%endif
+:
%configure --with-tcl-lib=tcl8.4 \
%if %{use_mudflap}
+ %( : 'mudflap(th) does not work with with threads:' )\
--without-pthread \
%endif
--with-smtp-msa=/usr/sbin/sendmail \
@@ -258,7 +252,7 @@
exit 5
}
#
-# imap does not use CFLAGS from configure, needs EXTRAFCLAGS:
+# 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' |
@@ -266,10 +260,12 @@
%install
install -D -m755 alpine/alpine $RPM_BUILD_ROOT%{_bindir}/alpine
+:
#
# 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
@@ -278,9 +274,11 @@
install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%name.desktop
%suse_update_desktop_file %name
+:
%if %obsolete_pine
ln -sf alpine $RPM_BUILD_ROOT%{_bindir}/pine
%endif
+:
%if %provide_pico_and_pilot
install -m755 pico/{pico,pilot} $RPM_BUILD_ROOT%{_bindir}
install -m644 doc/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -372,6 +370,8 @@
%doc %{_mandir}/man1/pilot.1.gz
%endif
%changelog
+* 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
- Remove files with unclear license from packaged sources (#308533)
- Add small bug fix: Postponed messages which were labelled as UTF-8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org