Accepting request 356013 from home:rudi_m:branches:Base:System

- remove unused /etc/pam.d/init
- remove notify-pam-dead.patch

OBS-URL: https://build.opensuse.org/request/show/356013
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=218
This commit is contained in:
Marcus Meissner 2016-01-27 12:36:46 +00:00 committed by Git OBS Bridge
parent 6b21b294e1
commit 62a80cfd1f
4 changed files with 9 additions and 55 deletions

View File

@ -1,49 +0,0 @@
--- src/Makefile
+++ src/Makefile 2010-04-13 00:00:00.000000000 +0000
@@ -8,7 +8,7 @@
# Version: @(#)Makefile 2.85-13 23-Mar-2004 miquels@cistron.nl
#
-CPPFLAGS =
+CPPFLAGS = -DUSE_PAM
CFLAGS ?= -ansi -O2 -fomit-frame-pointer
override CFLAGS += -W -Wall -D_GNU_SOURCE
STATIC =
@@ -78,6 +78,13 @@ else
endif
# Additional libs for GNU libc.
+ifneq ($(findstring -DUSE_PAM,$(CPPFLAGS)),)
+ INITLIBS += -lpam
+ PAMDOTD = /etc/pam.d
+ PAMINIT = $(PAMDOTD)/init
+endif
+
+# Additional libs for GNU libc.
ifneq ($(wildcard /usr/lib*/libcrypt.a),)
SULOGINLIBS += -lcrypt
endif
@@ -149,6 +156,11 @@ install:
for i in $(USRBIN); do \
$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
done
+ifneq ($(findstring -DUSE_PAM,$(CPPFLAGS)),)
+ $(INSTALL_DIR) $(ROOT)$(PAMDOTD)
+ test -s $(ROOT)$(PAMINIT) || \
+ $(INSTALL_DATA) init.sample $(ROOT)$(PAMINIT)
+endif
# $(INSTALL_DIR) $(ROOT)/etc/
# $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
ln -sf halt $(ROOT)/sbin/reboot
--- src/init.sample
+++ src/init.sample 2010-04-13 00:00:00.000000000 +0000
@@ -0,0 +1,8 @@
+#%PAM-1.0
+#
+# The PAM configuration file for /sbin/init
+# Used for updating the lastlog logging file
+#
+auth sufficient pam_rootok.so
+account include common-account
+session requisite pam_lastlog.so silent
+

View File

@ -3,7 +3,7 @@
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
# #
CPPFLAGS = -DUSE_PAM CPPFLAGS =
-CFLAGS ?= -ansi -O2 -fomit-frame-pointer -CFLAGS ?= -ansi -O2 -fomit-frame-pointer
+CFLAGS ?= $(RPM_OPT_FLAGS) +CFLAGS ?= $(RPM_OPT_FLAGS)
override CFLAGS += -W -Wall -D_GNU_SOURCE override CFLAGS += -W -Wall -D_GNU_SOURCE
@ -39,8 +39,8 @@
endif endif
ID = $(shell id -u) ID = $(shell id -u)
@@ -173,13 +168,8 @@ @@ -161,13 +156,8 @@
endif done
# $(INSTALL_DIR) $(ROOT)/etc/ # $(INSTALL_DIR) $(ROOT)/etc/
# $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/ # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
- ln -sf halt $(ROOT)/sbin/reboot - ln -sf halt $(ROOT)/sbin/reboot

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 26 10:24:25 UTC 2016 - sweet_f_a@gmx.de
- remove unused /etc/pam.d/init
- remove notify-pam-dead.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 25 15:46:22 UTC 2016 - werner@suse.de Mon Jan 25 15:46:22 UTC 2016 - werner@suse.de

View File

@ -36,7 +36,6 @@ Source2: startpar-%{START}.tar.bz2
Patch: %{name}-%{version}dsf.dif Patch: %{name}-%{version}dsf.dif
Patch2: %{name}-2.88dsf-suse.patch Patch2: %{name}-2.88dsf-suse.patch
Patch3: %{name}-2.88dsf-scripts2.patch Patch3: %{name}-2.88dsf-scripts2.patch
Patch4: notify-pam-dead.patch
Patch9: %{name}-2.88dsf-no-kill.patch Patch9: %{name}-2.88dsf-no-kill.patch
Patch11: %{name}-%{version}dsf-dostat.patch Patch11: %{name}-%{version}dsf-dostat.patch
# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables # PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
@ -69,7 +68,6 @@ sysvinit package.
%setup -n %{name}-%{SIVER}dsf -q -b 1 -b 2 %setup -n %{name}-%{SIVER}dsf -q -b 1 -b 2
%patch2 -p0 -b .suse %patch2 -p0 -b .suse
%patch3 -p0 -b .scripts2 %patch3 -p0 -b .scripts2
%patch4 -p0 -b .pam
%patch9 -p0 -b .no-kill %patch9 -p0 -b .no-kill
%patch11 -p0 -b .dostat %patch11 -p0 -b .dostat
%patch12 -p0 -b .ka5 %patch12 -p0 -b .ka5
@ -118,7 +116,6 @@ popd
%defattr (-,root,root,755) %defattr (-,root,root,755)
%doc COPYING COPYRIGHT doc/Propaganda %doc COPYING COPYRIGHT doc/Propaganda
%doc doc/Changelog doc/killproc %doc doc/Changelog doc/killproc
%config /etc/pam.d/init
/bin/pidof /bin/pidof
/bin/usleep /bin/usleep
/bin/fsync /bin/fsync