Hello community,
here is the log from the commit of package john for openSUSE:Factory checked in
at 2014-12-23 11:51:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/john (Old)
and /work/SRC/openSUSE:Factory/.john.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "john"
Changes:
--------
--- /work/SRC/openSUSE:Factory/john/john.changes 2014-01-13
12:02:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.john.new/john.changes 2014-12-23
11:49:43.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 15 23:41:30 UTC 2014 - l...@linux-schulserver.de
+
+- include "jumbo patch" into the build - special thanks to
+ Mark Draheim for the specfile patch (closes bnc #839246)
+
+-------------------------------------------------------------------
New:
----
john-1.7.9-jumbo-7.tar.bz2
john-1.7.9-jumbo-7.tar.bz2.sign
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ john.spec ++++++
--- /var/tmp/diff_new_pack.5VhPOu/_old 2014-12-23 11:49:46.000000000 +0100
+++ /var/tmp/diff_new_pack.5VhPOu/_new 2014-12-23 11:49:46.000000000 +0100
@@ -28,10 +28,11 @@
Source2: %{name}.8.gz
Source3: %{name}-rpmlintrc
Source4: %{name}.keyring
-# Source4:
http://www.openwall.com/john/g/%{name}-%{version}-jumbo-7.tar.bz2
-# Source5:
http://www.openwall.com/john/g/%{name}-%{version}-jumbo-7.tar.bz2.sign
Source6: mailer.8
Source7: relbench.8
+%define jumboversion john-1.7.9-jumbo-7
+Source8: %{jumboversion}.tar.bz2
+Source9: %{jumboversion}.tar.bz2.sign
Patch0: ppc64le.patch
BuildRequires: openssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,8 +48,11 @@
number of other hash types are supported as well.
%prep
-%setup -q
+%setup -q -a8
%patch0 -p1
+cd %{jumboversion} && cp -a ./* ..
+cd ..
+rm -r %{jumboversion}
# adapt the configs
perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g"
$RPM_BUILD_DIR/%{name}-%{version}/run/john.conf
perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g'
$RPM_BUILD_DIR/%{name}-%{version}/src/params.h
@@ -95,7 +99,7 @@
%endif
export TARGET
pushd src
-make clean $TARGET %{cflags} LDFLAGS='-lcrypto -lm'
+make clean $TARGET %{cflags} LDFLAGS='-lcrypto -lm -lz -lssl'
popd
%check
@@ -108,12 +112,12 @@
install -m 755 run/john %{buildroot}%{_bindir}/
cp -r run/un* %{buildroot}%{_bindir}/
install -m755 run/relbench %{buildroot}%{_bindir}/
-install -m 644 -p run/{password.lst,*.chr} %{buildroot}%johndir/
+install -m 644 -p run/{password.lst,*.chr,d*.conf,*local.conf}
%{buildroot}%johndir/
install -m 644 -p run/john.conf %{buildroot}%{_sysconfdir}/
install -m 755 -p run/mailer %{buildroot}%{_bindir}/
# handle documentation - makes rpmlint happy
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
-cp doc/* %{buildroot}%{_defaultdocdir}/%{name}/
+cp README-jumbo doc/* %{buildroot}%{_defaultdocdir}/%{name}/
rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL
# install man pages
install -m 644 -p %{SOURCE2} %{buildroot}%{_mandir}/man8/
@@ -136,6 +140,8 @@
%{_bindir}/mailer
%attr(644,root,root) %johndir/password.lst
%attr(644,root,root) %johndir/*.chr
+%attr(644,root,root) %johndir/d*.conf
+%attr(644,root,root) %johndir/*local.conf
%config (noreplace) %{_sysconfdir}/john.conf
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
