diff --git a/proftpd.changes b/proftpd.changes index 63007a0..b59ee72 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Nov 29 19:03:00 CET 2012 - sbrabec@suse.cz + +- Verify GPG signature. + +------------------------------------------------------------------- +Fri Nov 2 15:15:25 UTC 2012 - chris@computersalat.de + +- fix for bnc#787884 + (https://bugzilla.novell.com/show_bug.cgi?id=787884) + * added extra Source proftpd.conf.tmpfile + ------------------------------------------------------------------- Thu Aug 30 17:33:30 UTC 2012 - crrodriguez@opensuse.org diff --git a/proftpd.conf.tmpfile b/proftpd.conf.tmpfile new file mode 100644 index 0000000..3e19e7d --- /dev/null +++ b/proftpd.conf.tmpfile @@ -0,0 +1 @@ +d /var/run/proftpd 0755 root root ~ - diff --git a/proftpd.keyring b/proftpd.keyring new file mode 100644 index 0000000..265962c --- /dev/null +++ b/proftpd.keyring @@ -0,0 +1,33 @@ +pub 1024D/A511976A 2002-05-12 +uid TJ Saunders +sub 2048g/8C26F9DE 2002-05-12 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBDze4PkRBADtl8nbLuIgZkIdl6fUj9/LOBXGrtP5B8cTgDjBlURronHtLzkQ +oHqNS8zmh5gmg8F6EMnCy6tqTGlQ3OylhY2u8fBUFJZk0RpaGYka0SI+hkNn/Hmu +GLXs4+5RKIuL1lp1DFv2L2S+Qp3xFs0vYJsrdi7nRhM1/LqN9S0pr2/i9QCg/5bD +AMS9qiVZvd7E0464cWWUXDsD/2z7fwPUFD23bHGSpifSl8jOqUuOWf5lhJqXLpHZ +TnSsO+rOi5dXdB1fPwgvwFnv7akFStTpXaRq1XdB33/QTwWNO3DBXKe8VkBivXTY +nWHLiktQwoY06Ws6r2cYxfgRhoHBSQFR/e1OhURaV8d0nSZsISrUyOREAYFUZT0L +s0jHBADcNSLHoehRf69mBEh3SMk+hiNse8r0VTcE6aJ5AISE6famDQw9cQh8gdmf +R5LrN/QbF4qQ2jWrfzhkVB6oslyghk3KCncFMnmT/4QpPVfSeTon3yM0Sz9Gtr2Q +YRp6Qhy7RgnoJ35bMaleww18WKOJtS840PRikboy5XFXt14gvbQeVEogU2F1bmRl +cnMgPHRqQGNhc3RhZ2xpYS5vcmc+iFYEEBECAA4FAjze4PkECwMBAgIZAQASCRC3 +jok/pRGXagdlR1BHAAEB4EMAoL0MfmR26WnBxfQAUFD1bMnSO95EAKC1jnqqe9Xq +TPTsGWOZwNGc13nTmLkCDQQ83uD7EAgA9kJXtwh/CBdyorrWqULzBej5UxE5T7bx +brlLOCDaAadWoxTpj0BV89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJP +PT2N286Z4VeSWc39uK50T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrU +GvC/RgBYK+X0iP1YTknbzSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVb +GI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcp +esqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8vYlLIhkmuquiXsNV6TILOwACAgf+ORAr +y8LE18PVKiJk9/bpZ+LzSQ/kgNKDjqRsqT8HOFjToIpbbY1lOBErEr7OedJGK3ra +g1q8vD+kNK4MZdNcEeIcaMG7TnArOJ4zNZzKBQQzZp8hdv8heirfhJtb5MdFO2MI +N2+I9OoeUXNX1GVxYQJkuHpvsbqbZ6P2bRYwPUmnSAy6y2yy3ZmTZDD6ItaUaTIA +JbT8myTljeO4vz80nWldpUZfVtwkCRczjL7GYvwGbg1DZ45ND1pq9Kp5jqybevYw +d2a/7es+PgWQxy6qRFW3j95lm9Dd7ha29trziinxZ5GevUgyPIcs5SCQUG+cb5Yb +VUpLxGrHLKoW/mdBCYhOBBgRAgAGBQI83uD7ABIJELeOiT+lEZdqB2VHUEcAAQE1 +CwCdGzQx8HHoe2O+tc3ymntAdNl7kLYAoNN0gN75bS/ZWBrKrLR0ne6JAdkO +=X5Db +-----END PGP PUBLIC KEY BLOCK----- diff --git a/proftpd.spec b/proftpd.spec index f61af66..45e4243 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -30,6 +30,8 @@ Source1: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz.a Source11: %{name}.init Source12: %{name}.passwd Source13: %{name}.service +Source14: %{name}.conf.tmpfile +Source15: %{name}.keyring #PATCH-FIX-openSUSE: pam, logrotate, xinet Patch100: %{name}-1.3.4a-dist.patch #PATCH-FIX-openSUSE: provide a useful default config @@ -41,6 +43,7 @@ Patch103: %{name}-1.3.4a-strip.patch #PATCH-FIX-openSUSE: file-contains-date-and-time Patch104: %{name}-no_BuildDate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gpg-offline BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -131,6 +134,7 @@ Requires: %{name} = %{version} Here are Documentation for ProFTPD %prep +%gpg_verify %{S:1} %setup -q %{__rm} README.AIX %patch100 @@ -184,6 +188,8 @@ export CXXFLAGS="$CFLAGS" %if 0%{?has_systemd} %{__install} -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service +# systemd need to create a tmp dir: /var/run/proftpd +%{__install} -D -m 0644 %{S:14} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf %endif %find_lang %{name} @@ -277,6 +283,7 @@ fi %exclude %{_libdir}/%{name}/mod_sql_sqlite.so %if 0%{?has_systemd} %{_unitdir}/%{name}.service +%config %{_sysconfdir}/tmpfiles.d/%{name}.conf %endif %files devel