rpms/pam_ccreds/devel pam_ccreds-3-inst-no-root.patch, NONE, 1.1 pam_ccreds-3-chkpwd.patch, 1.2, 1.3 pam_ccreds.spec, 1.11, 1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 18 15:48:23 UTC 2006
Author: tmraz
Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25380
Modified Files:
pam_ccreds-3-chkpwd.patch pam_ccreds.spec
Added Files:
pam_ccreds-3-inst-no-root.patch
Log Message:
* Wed Jan 18 2006 Tomas Mraz <tmraz at redhat.com> - 3-3
- don't change ownership in make install
- build ccreds_validate as PIE
pam_ccreds-3-inst-no-root.patch:
Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE pam_ccreds-3-inst-no-root.patch ---
--- pam_ccreds-3/Makefile.am.inst-no-root 2005-10-29 03:21:50.000000000 +0200
+++ pam_ccreds-3/Makefile.am 2006-01-18 16:35:32.000000000 +0100
@@ -29,12 +29,12 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)/security
if EXTENSION_SO
- $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so
+ $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so
else
if EXTENSION_1
- $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/libpam_ccreds.1
+ $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/libpam_ccreds.1
else
- $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so.1
+ $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so.1
(cd $(DESTDIR)$(libdir)/security; rm -f pam_ccreds.so; ln -s pam_ccreds.so.1 pam_ccreds.so)
endif
endif
pam_ccreds-3-chkpwd.patch:
Makefile.am | 6 +
README | 13 +-
cc.h | 4
cc_lib.c | 79 +++++++++++++++++
cc_pam.c | 121 +++++++++++++++-----------
cc_validate.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 434 insertions(+), 57 deletions(-)
Index: pam_ccreds-3-chkpwd.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds-3-chkpwd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_ccreds-3-chkpwd.patch 4 Jan 2006 15:28:43 -0000 1.2
+++ pam_ccreds-3-chkpwd.patch 18 Jan 2006 15:48:19 -0000 1.3
@@ -1,5 +1,5 @@
---- /dev/null 2006-01-04 08:54:02.552773000 +0100
-+++ pam_ccreds-3/cc_validate.c 2006-01-04 15:22:31.000000000 +0100
+--- /dev/null 2006-01-18 09:11:26.108932750 +0100
++++ pam_ccreds-3/cc_validate.c 2006-01-04 16:21:15.000000000 +0100
@@ -0,0 +1,268 @@
+/*
+ * This program is designed to run setuid(root) or with sufficient
@@ -270,7 +270,7 @@
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
--- pam_ccreds-3/Makefile.am.chkpwd 2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/Makefile.am 2006-01-04 15:22:31.000000000 +0100
++++ pam_ccreds-3/Makefile.am 2006-01-18 16:30:58.000000000 +0100
@@ -1,8 +1,10 @@
noinst_PROGRAMS = pam_ccreds.so cc_test cc_dump
+sbin_PROGRAMS = ccreds_validate
@@ -282,18 +282,19 @@
pam_ccreds_so_SOURCES = cc_db.c cc_lib.c cc_pam.c cc.h
pam_ccreds_so_LDFLAGS = @pam_ccreds_so_LDFLAGS@
-@@ -13,6 +15,9 @@
+@@ -13,6 +15,10 @@
cc_dump_SOURCES = cc_dump.c
cc_dump_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc
+ccreds_validate_SOURCES = cc_validate.c
-+ccreds_validate_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc
++ccreds_validate_CFLAGS = -fPIE $(AM_CFLAGS)
++ccreds_validate_LDFLAGS = -pie -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc
+
DEFS = @DEFS@
if USE_NATIVE_LINKER
--- pam_ccreds-3/cc_pam.c.chkpwd 2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/cc_pam.c 2006-01-04 15:22:31.000000000 +0100
++++ pam_ccreds-3/cc_pam.c 2006-01-04 16:21:15.000000000 +0100
@@ -131,10 +131,12 @@
const char *authtok;
pam_cc_handle_t *pamcch;
@@ -478,7 +479,7 @@
return rc;
}
--- pam_ccreds-3/README.chkpwd 2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/README 2006-01-04 15:27:51.000000000 +0100
++++ pam_ccreds-3/README 2006-01-04 16:21:15.000000000 +0100
@@ -35,14 +35,13 @@
These are configured by the "action=" module option. The
following module options are also recognized:
@@ -501,7 +502,7 @@
this specific service
--- pam_ccreds-3/cc_lib.c.chkpwd 2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/cc_lib.c 2006-01-04 15:22:31.000000000 +0100
++++ pam_ccreds-3/cc_lib.c 2006-01-04 16:21:15.000000000 +0100
@@ -15,6 +15,10 @@
#include <unistd.h>
#include <errno.h>
@@ -593,7 +594,7 @@
+ return retval;
+}
--- pam_ccreds-3/cc.h.chkpwd 2005-10-29 03:21:50.000000000 +0200
-+++ pam_ccreds-3/cc.h 2006-01-04 15:22:31.000000000 +0100
++++ pam_ccreds-3/cc.h 2006-01-04 16:21:15.000000000 +0100
@@ -89,5 +89,9 @@
/* Dump contents - for debugging only */
int pam_cc_dump(pam_cc_handle_t *pamcch, FILE *fp);
Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pam_ccreds.spec 4 Jan 2006 15:28:43 -0000 1.11
+++ pam_ccreds.spec 18 Jan 2006 15:48:19 -0000 1.12
@@ -5,7 +5,8 @@
License: GPL
Group: System Environment/Base
Source0: %{name}-%{version}.tar.gz
-Patch1: pam_ccreds-3-chkpwd.patch
+Patch1: pam_ccreds-3-inst-no-root.patch
+Patch2: pam_ccreds-3-chkpwd.patch
BuildPrereq: automake db4-devel openssl-devel pam-devel
Requires: db4 pam
@@ -22,7 +23,9 @@
%prep
%setup -q
-%patch1 -p1 -b .chkpwd
+%patch1 -p1 -b .inst-no-root
+%patch2 -p1 -b .chkpwd
+touch compile
autoreconf
%build
@@ -43,6 +46,10 @@
%attr(4755,root,root) %{_sbindir}/ccreds_validate
%changelog
+* Wed Jan 18 2006 Tomas Mraz <tmraz at redhat.com> - 3-3
+- don't change ownership in make install
+- build ccreds_validate as PIE
+
* Wed Jan 4 2006 Tomas Mraz <tmraz at redhat.com> - 3-2
- the path to ccreds_validate helper was wrong
More information about the fedora-cvs-commits
mailing list