[at] Change makefile to work with latest release.
Marcela Mašláňová
mmaslano at fedoraproject.org
Mon Dec 2 16:08:04 UTC 2013
commit abcc660cd9ad425e07d4959f53ac8def6280a9de
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date: Thu Sep 19 17:25:27 2013 +0200
Change makefile to work with latest release.
at-3.1.14-makefile.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++
at.spec | 26 +++++++-------
2 files changed, 95 insertions(+), 13 deletions(-)
---
diff --git a/at-3.1.14-makefile.patch b/at-3.1.14-makefile.patch
new file mode 100644
index 0000000..2ffb4a8
--- /dev/null
+++ b/at-3.1.14-makefile.patch
@@ -0,0 +1,82 @@
+diff -up at-3.1.14/Makefile.in.make at-3.1.14/Makefile.in
+--- at-3.1.14/Makefile.in.make 2013-09-08 14:43:53.000000000 +0200
++++ at-3.1.14/Makefile.in 2013-09-19 16:48:03.605192754 +0200
+@@ -67,13 +67,13 @@ LIST = Filelist Filelist.asc
+ all: at atd atd.service atrun
+
+ at: $(ATOBJECTS)
+- $(CC) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
++ $(CC) $(LDFLAGS) -o at pie $(ATOBJECTS) $(LIBS) $(LEXLIB) $(SELINUXLIB) $(PAMLIB)
+ rm -f $(CLONES)
+ $(LN_S) -f at atq
+ $(LN_S) -f at atrm
+
+ atd: $(RUNOBJECTS)
+- $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
++ $(CC) $(LDFLAGS) -o atd -pie $(RUNOBJECTS) $(LIBS) $(SELINUXLIB) $(PAMLIB)
+
+ y.tab.c y.tab.h: parsetime.y
+ $(YACC) -d parsetime.y
+@@ -88,38 +88,41 @@ atrun: atrun.in
+ configure
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $(DEFS) $*.c
++ $(CC) -c $(CFLAGS) -fPIE $(DEFS) $*.c
+
+ install: all
+- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
+- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
+- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
+- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
+- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
+- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
+- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
++ $(INSTALL) root -m 755 -d $(IROOT)$(etcdir)
++ $(INSTALL) root -m 755 -d $(IROOT)$(bindir)
++ $(INSTALL) root -m 755 -d $(IROOT)$(sbindir)
++ $(INSTALL) root -m 755 -d $(IROOT)$(docdir)
++ $(INSTALL) root -m 755 -d $(IROOT)$(atdocdir)
++ $(INSTALL) -m 755 -d $(IROOT)$(etcdir)/pam.d/
++ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR)
++ chmod 700 $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
++ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
+ touch $(IROOT)$(LFILE)
+ chmod 600 $(IROOT)$(LFILE)
+ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
+- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
+- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
++ test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -m 600 at.deny $(IROOT)$(etcdir)/
++ $(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd
++ $(INSTALL) -m 4755 at $(IROOT)$(bindir)
+ $(LN_S) -f at $(IROOT)$(bindir)/atq
+ $(LN_S) -f at $(IROOT)$(bindir)/atrm
+- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
+- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
+- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
+- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
+- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
+- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
+- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
++ $(INSTALL) -m 755 batch $(IROOT)$(bindir)
++ $(INSTALL) -d -m 755 $(IROOT)$(man1dir)
++ $(INSTALL) -d -m 755 $(IROOT)$(man5dir)
++ $(INSTALL) -d -m 755 $(IROOT)$(man8dir)
++ $(INSTALL) -m 755 atd $(IROOT)$(sbindir)
++ $(INSTALL) -m 755 atrun $(IROOT)$(sbindir)
++ $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/
+ cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
+- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
++ $(INSTALL) -m 644 atd.8 $(IROOT)$(man8dir)/
+ sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
+- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
++ $(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
+ rm -f tmpman
+- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
++ $(INSTALL) -m 644 at.allow.5 $(IROOT)$(man5dir)/
+ cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
+- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
++ $(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir)
+ rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
+ $(IROOT)$(mandir)/cat1/atq.1*
+ rm -f $(IROOT)$(mandir)/cat1/atd.8*
diff --git a/at.spec b/at.spec
index 689fb8b..fa3823a 100644
--- a/at.spec
+++ b/at.spec
@@ -2,8 +2,8 @@
Summary: Job spooling tools
Name: at
-Version: 3.1.13
-Release: 13%{?dist}
+Version: 3.1.14
+Release: 1%{?dist}
# http://packages.debian.org/changelogs/pool/main/a/at/current/copyright
# + install-sh is MIT license with changes under Public Domain
License: GPLv3+ and GPLv2+ and ISC and MIT and Public Domain
@@ -17,7 +17,7 @@ Source2: atd.init
Source3: atd.sysconf
Source5: atd.systemd
-Patch1: at-3.1.13-makefile.patch
+Patch1: at-3.1.14-makefile.patch
Patch2: at-3.1.12-opt_V.patch
Patch3: at-3.1.12-shell.patch
Patch4: at-3.1.13-nitpicks.patch
@@ -71,16 +71,16 @@ is not used as the system init process.
%setup -q
cp %{SOURCE1} .
%patch1 -p1 -b .make
-%patch2 -p1 -b .opt_V
-%patch3 -p1 -b .shell
-%patch4 -p1 -b .nit
-%patch5 -p1 -b .pam
-%patch6 -p1 -b .selinux
-%patch7 -p1 -b .nowrap
-%patch8 -p1 -b .export
-%patch9 -p1 -b .mail
-%patch10 -p1 -b .posix
-%patch11 -p1 -b .help
+#%%patch2 -p1 -b .opt_V
+#%%patch3 -p1 -b .shell
+#%%patch4 -p1 -b .nit
+#%%patch5 -p1 -b .pam
+#%%patch6 -p1 -b .selinux
+#%%patch7 -p1 -b .nowrap
+#%%patch8 -p1 -b .export
+#%%patch9 -p1 -b .mail
+#%%patch10 -p1 -b .posix
+#%%patch11 -p1 -b .help
%build
# patch9 touches configure.in
More information about the scm-commits
mailing list