Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50

Tag as initscripts-9.50-1

Conflicts:
	Makefile
	lang.csh
	lang.sh
	po/Makefile
	rc.d/init.d/network
	service
	sysconfig.txt
	sysconfig/init
	sysconfig/network-scripts/ifup
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ippp
	sysconfig/network-scripts/network-functions
	sysctl.conf
	systemd/fedora-storage-init

5 files changed, 32 insertions, 38 deletions

diff --git a/src/Makefile b/src/Makefile
index d93e7202..dc4bf593 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
 CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
+LDFLAGS+=$(RPM_LD_FLAGS)
 
 PROGS=usernetctl netreport usleep ipcalc \
 	ppp-watch consoletype genhostid rename_device
@@ -17,16 +18,16 @@ clean:
 	rm -f $(PROGS) *.o *~
 
 install:
-	mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/lib/udev
-	install -m 755 usleep $(ROOT)/bin/usleep
+	mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev
+	install -m 755 usleep $(ROOT)/usr/bin/usleep
 	install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
-	install -m 2755 netreport $(ROOT)/sbin/netreport
-	install -m 755 ipcalc $(ROOT)/bin/ipcalc
-	install -m 755 genhostid $(ROOT)/sbin/genhostid
-	install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
-	install -m 755 consoletype $(ROOT)/sbin/consoletype
-	install -m 755 sushell $(ROOT)/sbin/sushell
-	install -m 755 rename_device $(ROOT)/lib/udev/rename_device
+	install -m 2755 netreport $(ROOT)/usr/sbin/netreport
+	install -m 755 ipcalc $(ROOT)/usr/bin/ipcalc
+	install -m 755 genhostid $(ROOT)/usr/sbin/genhostid
+	install -m 755 ppp-watch $(ROOT)/usr/sbin/ppp-watch
+	install -m 755 consoletype $(ROOT)/usr/sbin/consoletype
+	install -m 755 sushell $(ROOT)/usr/sbin/sushell
+	install -m 755 rename_device $(ROOT)/usr/lib/udev/rename_device
 	install -m 644 genhostid.1 $(ROOT)$(mandir)/man1
 	install -m 644 netreport.1 $(ROOT)$(mandir)/man1
 	install -m 644 usleep.1 $(ROOT)$(mandir)/man1
@@ -35,7 +36,6 @@ install:
 	install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1
 	install -m 644 consoletype.1 $(ROOT)$(mandir)/man1
 	install -m 644 ifup.8 $(ROOT)$(mandir)/man8
-	install -m 644 setsysfont.8 $(ROOT)$(mandir)/man8
 	install -m 644 sushell.8 $(ROOT)$(mandir)/man8
 	ln -s ifup.8 $(ROOT)$(mandir)/man8/ifdown.8
 
@@ -52,7 +52,13 @@ usernetctl.o: usernetctl.c
 	$(CC) $(CFLAGS) -fPIE -c usernetctl.c -o usernetctl.o
 
 usernetctl: usernetctl.c usernetctl.o
-	$(CC) $(LDFLAGS) -pie -o $@ $@.o
+	$(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o
+
+netreport.o: netreport.c
+	$(CC) $(CFLAGS) -fPIE -c netreport.c -o netreport.o
+
+netreport: netreport.o
+	$(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o
 
 shvar.o: shvar.c
 	$(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c shvar.c -o shvar.o
diff --git a/src/ifup.8 b/src/ifup.8
index 3a492cd0..1cf1fcd8 100644
--- a/src/ifup.8
+++ b/src/ifup.8
@@ -5,9 +5,9 @@ ifup - bring a network interface up
 
 ifdown - take a network interface down
 .SH SYNOPSIS
-.B ifup IFACE [boot]
+.B ifup CONFIG [boot]
  
-.B ifdown IFACE
+.B ifdown CONFIG
 
 .SH DESCRIPTION
 The
diff --git a/src/ipcalc.c b/src/ipcalc.c
index 7316f058..bec14eb5 100644
--- a/src/ipcalc.c
+++ b/src/ipcalc.c
@@ -141,7 +141,12 @@ struct in_addr calc_broadcast(struct in_addr addr, int prefix)
     struct in_addr broadcast;
 
     memset(&broadcast, 0, sizeof(broadcast));
-    broadcast.s_addr = (addr.s_addr & mask.s_addr) | ~mask.s_addr;
+
+/* if prefix is set to 31 return 255.255.255.255 (RFC3021) */
+    if (mask.s_addr ==  htonl(0xFFFFFFFE))
+        broadcast.s_addr = htonl(0xFFFFFFFF);
+    else
+        broadcast.s_addr = (addr.s_addr & mask.s_addr) | ~mask.s_addr;
     return broadcast;
 }
 
diff --git a/src/rename_device.c b/src/rename_device.c
index f96291b0..8e28154d 100644
--- a/src/rename_device.c
+++ b/src/rename_device.c
@@ -241,10 +241,15 @@ void take_lock() {
 	while (1) {
 		lockfd = open(LOCKFILE, O_RDWR|O_CREAT|O_EXCL, 0644);
 		if (lockfd != -1) {
-			write(lockfd,"%d\n",getpid());
+			char buf[32];
+
+			snprintf(buf,32,"%d\n",getpid());
+			write(lockfd,buf,strlen(buf));
 			close(lockfd);
 			break;
-		}
+		} else if (errno == EACCES)
+                        break;
+
 		count++;
 		/* If we've slept for 20 seconds, break the lock. */
 		if (count >= 200) {
diff --git a/src/setsysfont.8 b/src/setsysfont.8
deleted file mode 100644
index 69958e94..00000000
--- a/src/setsysfont.8
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" Copyright 2009 Petr Lautrbach (plautrba@redhat.com)
-.TH setsysfont 8  2009-10-27 "" "System Administration tools and Daemons"
-.SH NAME
-setsysfont \- set console font according to /etc/sysconfig/i18n.
-.SH SYNOPSIS
-.B setsysfont
-.SH DESCRIPTION
-.B setsysfont
-sets the console font for current virtual terminal. The font setting is read from /etc/sysconfig/i18n.
-.SH NOTES
-.B setsysfont
-should not need to be called in normal practice, as the font is set on boot.
-
-.SH FILES
-.TP
-\fB/etc/sysconfig/i18n\fR
-
-.SH "SEE ALSO"
-.BR /usr/share/doc/initscripts-*/sysconfig.txt,
-.BR unicode_start (1),
-.BR setfont (8),
-.BR consoletype (1)