From 85e2c065eda349d78a9f7d3b17435969da5bd826703c519cb1a980c61e2608bf Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 18 Jan 2016 10:15:02 +0000 Subject: [PATCH] Update to version 1.0.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools/pam_wrapper?expand=0&rev=2 --- pam_wrapper-1.0.0-fix_obs_build.patch | 91 --------------------------- pam_wrapper-1.0.0.tar.gz | 3 - pam_wrapper.changes | 8 +++ pam_wrapper.spec | 6 +- 4 files changed, 9 insertions(+), 99 deletions(-) delete mode 100644 pam_wrapper-1.0.0-fix_obs_build.patch delete mode 100644 pam_wrapper-1.0.0.tar.gz diff --git a/pam_wrapper-1.0.0-fix_obs_build.patch b/pam_wrapper-1.0.0-fix_obs_build.patch deleted file mode 100644 index 96b5600..0000000 --- a/pam_wrapper-1.0.0-fix_obs_build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8b401834e1b33ba9dda530a1e9cd76beb54aec91 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 14 Jan 2016 13:46:01 +0100 -Subject: [PATCH 1/3] cmake: Do not require a C++ compiler - -Signed-off-by: Andreas Schneider ---- - src/modules/CMakeLists.txt | 2 +- - src/python/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt -index 93ce522..8e13a0b 100644 ---- a/src/modules/CMakeLists.txt -+++ b/src/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --project(pam_wrapper-modules) -+project(pam_wrapper-modules C) - - set(PAM_MODULES pam_matrix pam_get_items pam_set_items) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 108daae..2906d3e 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -1,4 +1,4 @@ --project(pypamtest) -+project(pypamtest C) - - include_directories(${CMAKE_BINARY_DIR}) - include_directories(${pam_wrapper-headers_DIR}) --- -2.7.0 - - -From 8b41fc2429cfabdc3213b5baaa9fe5911936dc9f Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 14 Jan 2016 17:04:07 +0100 -Subject: [PATCH 2/3] cmake: Link python module against the python library - -Signed-off-by: Andreas Schneider ---- - src/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 2906d3e..cbee2a6 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -5,7 +5,7 @@ include_directories(${pam_wrapper-headers_DIR}) - include_directories(${PYTHON_INCLUDE_DIR}) - - python_add_module(pypamtest pypamtest.c) --target_link_libraries(pypamtest pamtest) -+target_link_libraries(pypamtest pamtest ${PYTHON_LIBRARY}) - - install( - TARGETS --- -2.7.0 - - -From 13ee3e87a0f4f96c5593f5c14db9c80c07ef4b95 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 14 Jan 2016 17:04:33 +0100 -Subject: [PATCH 3/3] pwrap: Return EPROTONOSUPPORT in audit_open() - -I don't know why but returning EINVAL doesn't work. It treats it as -success and tries to write to it. - -Signed-off-by: Andreas Schneider ---- - src/pam_wrapper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pam_wrapper.c b/src/pam_wrapper.c -index 0c451d1..a388b29 100644 ---- a/src/pam_wrapper.c -+++ b/src/pam_wrapper.c -@@ -1523,7 +1523,7 @@ int audit_open(void) - * Tell the application that the kernel doesn't - * have audit compiled in. - */ -- errno = EINVAL; -+ errno = EPROTONOSUPPORT; - return -1; - } - --- -2.7.0 - diff --git a/pam_wrapper-1.0.0.tar.gz b/pam_wrapper-1.0.0.tar.gz deleted file mode 100644 index 4457a97..0000000 --- a/pam_wrapper-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ee08bd5fd4443c64df7f96c794338176c34c053473b4fcd3e701802083d9d3f -size 84585 diff --git a/pam_wrapper.changes b/pam_wrapper.changes index 2bad0f0..ef5e765 100644 --- a/pam_wrapper.changes +++ b/pam_wrapper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 18 10:13:41 UTC 2016 - asn@cryptomilk.org + +- Update to version 1.0.1 + * Fixed issue with audit_open() and sshd + * Fixed several issues found by Coverity + * Fixed python linking issues + ------------------------------------------------------------------- Thu Jan 14 16:13:36 UTC 2016 - asn@cryptomilk.org diff --git a/pam_wrapper.spec b/pam_wrapper.spec index 1f6ec35..5096f62 100644 --- a/pam_wrapper.spec +++ b/pam_wrapper.spec @@ -24,7 +24,7 @@ ############################# NOTE ################################## Name: pam_wrapper -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: A tool to test PAM applications and PAM modules @@ -35,8 +35,6 @@ Url: http://cwrap.org/ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc -Patch0: pam_wrapper-1.0.0-fix_obs_build.patch - BuildRequires: cmake BuildRequires: doxygen BuildRequires: libcmocka-devel @@ -104,8 +102,6 @@ the header files for libpamtest %prep %setup -q -%patch0 -p1 -b .pam_wrapper-1.0.0-fix_obs_build.patch - %build %cmake \ -DUNIT_TESTING=ON