[gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r7 named.init-r5 - gentoo-commits

From:	"Christian Ruppert (idl0r)" <idl0r@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r7 named.init-r5
Date:	Thu, 26 Aug 2010 16:03:44
Message-Id:	`20100826160341.3994B20051@flycatcher.gentoo.org`

1

idl0r       10/08/26 16:03:41

2

3

  Modified:             named.init-r7 named.init-r5

4

  Log:

5

  Create piddir in the init script if necessary, bug 334535 and bug 332633, thanks to Eray Aslan <eray.aslan@×××××××.tr>

6

7

  (Portage version: 2.2_rc69/cvs/Linux x86_64)

8

9

Revision  Changes    Path

10

1.5                  net-dns/bind/files/named.init-r7

11

12

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.5&view=markup

13

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.5&content-type=text/plain

14

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?r1=1.4&r2=1.5

15

16

Index: named.init-r7

17

===================================================================

18

RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v

19

retrieving revision 1.4

20

retrieving revision 1.5

21

diff -u -r1.4 -r1.5

22

--- named.init-r7	9 Jun 2010 16:25:05 -0000	1.4

23

+++ named.init-r7	26 Aug 2010 16:03:41 -0000	1.5

24

@@ -1,7 +1,7 @@

25

 #!/sbin/runscript

26

 # Copyright 1999-2010 Gentoo Foundation

27

 # Distributed under the terms of the GNU General Public License v2

28

-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.4 2010/06/09 16:25:05 idl0r Exp $

29

+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.5 2010/08/26 16:03:41 idl0r Exp $

30

31

 opts="start stop reload restart"

32

33

@@ -53,11 +53,18 @@

34

 		[[ ! -d ${CHROOT}/dev || ! -d ${CHROOT}/etc || ! -d ${CHROOT}/var ]] && return 1

35

 		[[ ! -d ${CHROOT}/var/run || ! -d ${CHROOT}/var/log ]] && return 1

36

 		[[ ! -d ${CHROOT}/etc/bind || ! -d ${CHROOT}/var/bind ]] && return 1

37

-		[[ ! -d ${CHROOT}/var/run/named || ! -d ${CHROOT}/var/log/named ]] && return 1

38

+		[[ ! -d ${CHROOT}/var/log/named ]] && return 1

39

 		[[ ! -e ${CHROOT}/etc/localtime ]] && return 1

40

 		[[ ! -c ${CHROOT}/dev/null || ! -c ${CHROOT}/dev/zero ]] && return 1

41

 		[[ ! -c ${CHROOT}/dev/random && ! -c ${CHROOT}/dev/urandom ]] && return 1

42

fi

43

+

44

+	# create piddir (usually /var/run/named) if necessary

45

+	local piddir="${PIDFILE%/*}"

46

+	if [ ! -d "${piddir}" ] ; then

47

+		checkpath -q -d -o root:named -m 0770 "${piddir}" || return 1

48

+	fi

49

+

50

 	return 0

51

}

1.2                  net-dns/bind/files/named.init-r5

57

58

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.2&view=markup

59

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.2&content-type=text/plain

60

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?r1=1.1&r2=1.2

61

62

Index: named.init-r5

63

===================================================================

64

RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v

65

retrieving revision 1.1

66

retrieving revision 1.2

67

diff -u -r1.1 -r1.2

68

--- named.init-r5	2 Jun 2007 22:34:48 -0000	1.1

69

+++ named.init-r5	26 Aug 2010 16:03:41 -0000	1.2

70

@@ -1,7 +1,7 @@

71

 #!/sbin/runscript

72

-# Copyright 1999-2004 Gentoo Foundation

73

+# Copyright 1999-2010 Gentoo Foundation

74

 # Distributed under the terms of the GNU General Public License v2

75

-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.1 2007/06/02 22:34:48 voxus Exp $

76

+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.2 2010/08/26 16:03:41 idl0r Exp $

77

78

 opts="start stop reload restart"

79

80

@@ -31,6 +31,12 @@

81

)

82

83

 	KEY="${CHROOT}/etc/bind/rndc.key"

84

+

85

+	# create piddir (usually /var/run/named) if necessary

86

+	local piddir="${PIDFILE%/*}"

87

+	if [ ! -d "${piddir}" ] ; then

88

+		checkpath -q -d -o root:named -m 0770 "${piddir}" || return 1

89

+	fi

90

}

91

92

 start() {

1	idl0r 10/08/26 16:03:41
2
3	Modified: named.init-r7 named.init-r5
4	Log:
5	Create piddir in the init script if necessary, bug 334535 and bug 332633, thanks to Eray Aslan <eray.aslan@×××××××.tr>
6
7	(Portage version: 2.2_rc69/cvs/Linux x86_64)
8
9	Revision Changes Path
10	1.5 net-dns/bind/files/named.init-r7
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.5&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.5&content-type=text/plain
14	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?r1=1.4&r2=1.5
15
16	Index: named.init-r7
17	===================================================================
18	RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v
19	retrieving revision 1.4
20	retrieving revision 1.5
21	diff -u -r1.4 -r1.5
22	--- named.init-r7 9 Jun 2010 16:25:05 -0000 1.4
23	+++ named.init-r7 26 Aug 2010 16:03:41 -0000 1.5
24	@@ -1,7 +1,7 @@
25	#!/sbin/runscript
26	# Copyright 1999-2010 Gentoo Foundation
27	# Distributed under the terms of the GNU General Public License v2
28	-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.4 2010/06/09 16:25:05 idl0r Exp $
29	+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.5 2010/08/26 16:03:41 idl0r Exp $
30
31	opts="start stop reload restart"
32
33	@@ -53,11 +53,18 @@
34	[[ ! -d ${CHROOT}/dev \|\| ! -d ${CHROOT}/etc \|\| ! -d ${CHROOT}/var ]] && return 1
35	[[ ! -d ${CHROOT}/var/run \|\| ! -d ${CHROOT}/var/log ]] && return 1
36	[[ ! -d ${CHROOT}/etc/bind \|\| ! -d ${CHROOT}/var/bind ]] && return 1
37	- [[ ! -d ${CHROOT}/var/run/named \|\| ! -d ${CHROOT}/var/log/named ]] && return 1
38	+ [[ ! -d ${CHROOT}/var/log/named ]] && return 1
39	[[ ! -e ${CHROOT}/etc/localtime ]] && return 1
40	[[ ! -c ${CHROOT}/dev/null \|\| ! -c ${CHROOT}/dev/zero ]] && return 1
41	[[ ! -c ${CHROOT}/dev/random && ! -c ${CHROOT}/dev/urandom ]] && return 1
42	fi
43	+
44	+ # create piddir (usually /var/run/named) if necessary
45	+ local piddir="${PIDFILE%/*}"
46	+ if [ ! -d "${piddir}" ] ; then
47	+ checkpath -q -d -o root:named -m 0770 "${piddir}" \|\| return 1
48	+ fi
49	+
50	return 0
51	}
52
53
54
55
56	1.2 net-dns/bind/files/named.init-r5
57
58	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.2&view=markup
59	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.2&content-type=text/plain
60	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?r1=1.1&r2=1.2
61
62	Index: named.init-r5
63	===================================================================
64	RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v
65	retrieving revision 1.1
66	retrieving revision 1.2
67	diff -u -r1.1 -r1.2
68	--- named.init-r5 2 Jun 2007 22:34:48 -0000 1.1
69	+++ named.init-r5 26 Aug 2010 16:03:41 -0000 1.2
70	@@ -1,7 +1,7 @@
71	#!/sbin/runscript
72	-# Copyright 1999-2004 Gentoo Foundation
73	+# Copyright 1999-2010 Gentoo Foundation
74	# Distributed under the terms of the GNU General Public License v2
75	-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.1 2007/06/02 22:34:48 voxus Exp $
76	+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.2 2010/08/26 16:03:41 idl0r Exp $
77
78	opts="start stop reload restart"
79
80	@@ -31,6 +31,12 @@
81	)
82
83	KEY="${CHROOT}/etc/bind/rndc.key"
84	+
85	+ # create piddir (usually /var/run/named) if necessary
86	+ local piddir="${PIDFILE%/*}"
87	+ if [ ! -d "${piddir}" ] ; then
88	+ checkpath -q -d -o root:named -m 0770 "${piddir}" \|\| return 1
89	+ fi
90	}
91
92	start() {

Gentoo Archives: gentoo-commits