From 020707d1d5ea5a6862f7f0e649d56d7558f9d325 Mon Sep 17 00:00:00 2001 From: Dmitry Fedorov Date: Wed, 21 Jan 2015 20:07:38 +0300 Subject: [PATCH] regenerate mans; use html2text instead of w3m --- pam-1.1.8-browser.patch | 14 ++++++++++++++ pam.spec | 19 +++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pam-1.1.8-browser.patch diff --git a/pam-1.1.8-browser.patch b/pam-1.1.8-browser.patch new file mode 100644 index 0000000..63e2756 --- /dev/null +++ b/pam-1.1.8-browser.patch @@ -0,0 +1,14 @@ +--- a/configure.in.old 2013-09-18 16:30:13.000000000 +0400 ++++ b/configure.in 2015-01-21 19:36:59.000000000 +0300 +@@ -552,9 +552,9 @@ + JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], + [DocBook XSL Stylesheets], [], enable_docu=no) + +-AC_PATH_PROG([BROWSER], [w3m]) ++AC_PATH_PROG([BROWSER], [html2text]) + if test ! -z "$BROWSER"; then +- BROWSER="$BROWSER -T text/html -dump" ++ BROWSER="$BROWSER" + else + enable_docu=no + fi diff --git a/pam.spec b/pam.spec index ff850a0..a4b7372 100644 --- a/pam.spec +++ b/pam.spec @@ -83,12 +83,14 @@ Patch701: pam-1.1.0-console-nopermsd.patch # (proyvind): add missing constant that went with rpc removal from glibc 2.14 Patch702: Linux-PAM-1.1.4-add-now-missing-nis-constant.patch -# (akdengi> add user to default group users which need for Samba +# (akdengi) add user to default group users which need for Samba Patch801: Linux-PAM-1.1.4-group_add_users.patch Patch802: pam-CVE-2014-2583.patch Patch803: pam-CVE-2013-7041.patch Patch804: pam-1.1.8-pbuild.patch +# (din) use html2text instead of w3m +Patch805: pam-1.1.8-browser.patch BuildRequires: selinux-devel >= 2.1.6-7 BuildRequires: bison @@ -104,6 +106,8 @@ BuildRequires: libaudit-devel BuildRequires: glibc-crypt_blowfish-devel BuildRequires: gettext-devel BuildRequires: pkgconfig(libtirpc) +BuildRequires: db-devel +BuildRequires: html2text %if %with_prelude BuildRequires: prelude-devel >= 0.9.0 %else @@ -181,12 +185,6 @@ mv pam-redhat-%{pam_redhat_version}/* modules install -m644 %{SOURCE501} %{SOURCE502} modules/pam_tty_audit/ -#mkdir -p doc/txts -#for readme in modules/pam_*/README ; do -# cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` -#done - -#libtoolize -cf autoreconf -i %build @@ -199,10 +197,15 @@ autoreconf -i --disable-static \ --disable-prelude \ --enable-selinux \ - --enable-audit + --enable-audit %make %install +mkdir -p doc/txts +for readme in modules/pam_*/README ; do + cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` +done + mkdir -p %{buildroot}%{_includedir}/security mkdir -p %{buildroot}/%{_lib}/security %makeinstall_std LDCONFIG=: