From 1bcca37dfa40272de8afac3fd17b9c835872deacf335c1327b7850ef73dffdd4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Jun 2020 08:28:44 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/alpine revision 47.0 OBS-URL: https://build.opensuse.org/package/show/server:mail/alpine?expand=0&rev=2851f9c3408c16b05cb2d3e503ba3f2f --- alpine.changes | 6 ++++++ alpine.spec | 5 ++++- extern.diff | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 extern.diff diff --git a/alpine.changes b/alpine.changes index c1015be..4801c2d 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 7 10:48:05 UTC 2020 - Jan Engelhardt + +- Add extern.diff. +- Mark license texts as %license. + ------------------------------------------------------------------- Thu May 7 20:32:03 UTC 2020 - Jan Engelhardt diff --git a/alpine.spec b/alpine.spec index 15c76c4..456e067 100644 --- a/alpine.spec +++ b/alpine.spec @@ -41,6 +41,7 @@ Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch60: signal-and-panic-improvements.diff Patch61: return-values.diff +Patch62: extern.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -144,6 +145,7 @@ fi %patch20 -p1 %patch60 -p1 %patch61 -p1 +%patch62 -p1 %endif # End of "if !{build_vanilla}" %build @@ -274,7 +276,8 @@ fi %doc %{_mandir}/man1/alpine.* %doc %{_mandir}/man1/rpdump.* %doc %{_mandir}/man1/rpload.* -%doc README NOTICE LICENSE +%doc README +%license LICENSE NOTICE %doc doc/mailcap.unx doc/mime.types doc/tech-notes/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine %{_bindir}/alpinef diff --git a/extern.diff b/extern.diff new file mode 100644 index 0000000..dbfb7a6 --- /dev/null +++ b/extern.diff @@ -0,0 +1,22 @@ +From: Jan Engelhardt +Date: 2020-06-07 12:47:25.957623338 +0200 + +Can't define a symbol twice. (smime.c being the other place.) + +--- + pith/smkeys.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: alpine-2.22/pith/smkeys.c +=================================================================== +--- alpine-2.22.orig/pith/smkeys.c ++++ alpine-2.22/pith/smkeys.c +@@ -50,7 +50,7 @@ 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); ++extern 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