1 |
zmedico 08/06/14 16:54:53 |
2 |
|
3 |
Modified: ppp-2.4.4-r14.ebuild ppp-2.4.4-r15.ebuild ChangeLog |
4 |
Log: |
5 |
Bug #226505 - For compatibility with phase execution order in |
6 |
>=portage-2.1.5, call has_version inside pkg_preinst instead of |
7 |
pkg_postinst. |
8 |
(Portage version: 2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.4 net-dialup/ppp/ppp-2.4.4-r14.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild?rev=1.4&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild?rev=1.4&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild?r1=1.3&r2=1.4 |
16 |
|
17 |
Index: ppp-2.4.4-r14.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild,v |
20 |
retrieving revision 1.3 |
21 |
retrieving revision 1.4 |
22 |
diff -u -r1.3 -r1.4 |
23 |
--- ppp-2.4.4-r14.ebuild 31 Mar 2008 04:38:30 -0000 1.3 |
24 |
+++ ppp-2.4.4-r14.ebuild 14 Jun 2008 16:54:53 -0000 1.4 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2008 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild,v 1.3 2008/03/31 04:38:30 ricmm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild,v 1.4 2008/06/14 16:54:53 zmedico Exp $ |
30 |
|
31 |
inherit eutils flag-o-matic toolchain-funcs linux-info pam |
32 |
|
33 |
@@ -132,7 +132,11 @@ |
34 |
} |
35 |
|
36 |
pkg_preinst() { |
37 |
- if use radius && [ -d "${ROOT}/etc/radiusclient" ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then |
38 |
+ has_version "<${CATEGORY}/${PN}-2.4.3-r5" |
39 |
+ previous_less_than_2_4_3_r5=$? |
40 |
+ |
41 |
+ if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \ |
42 |
+ [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then |
43 |
ebegin "Copy /etc/radiusclient to /etc/ppp/radius" |
44 |
cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius" |
45 |
eend $? |
46 |
@@ -281,7 +285,7 @@ |
47 |
# lib name has changed |
48 |
sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" |
49 |
|
50 |
- if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then |
51 |
+ if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then |
52 |
echo |
53 |
ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from" |
54 |
ewarn " /etc/radiusclient to /etc/ppp/radius." |
55 |
|
56 |
|
57 |
|
58 |
1.3 net-dialup/ppp/ppp-2.4.4-r15.ebuild |
59 |
|
60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild?rev=1.3&view=markup |
61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild?rev=1.3&content-type=text/plain |
62 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild?r1=1.2&r2=1.3 |
63 |
|
64 |
Index: ppp-2.4.4-r15.ebuild |
65 |
=================================================================== |
66 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild,v |
67 |
retrieving revision 1.2 |
68 |
retrieving revision 1.3 |
69 |
diff -u -r1.2 -r1.3 |
70 |
--- ppp-2.4.4-r15.ebuild 14 May 2008 22:05:03 -0000 1.2 |
71 |
+++ ppp-2.4.4-r15.ebuild 14 Jun 2008 16:54:53 -0000 1.3 |
72 |
@@ -1,6 +1,6 @@ |
73 |
# Copyright 1999-2008 Gentoo Foundation |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild,v 1.2 2008/05/14 22:05:03 flameeyes Exp $ |
76 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild,v 1.3 2008/06/14 16:54:53 zmedico Exp $ |
77 |
|
78 |
inherit eutils flag-o-matic toolchain-funcs linux-info pam |
79 |
|
80 |
@@ -133,7 +133,11 @@ |
81 |
} |
82 |
|
83 |
pkg_preinst() { |
84 |
- if use radius && [ -d "${ROOT}/etc/radiusclient" ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then |
85 |
+ has_version "<${CATEGORY}/${PN}-2.4.3-r5" |
86 |
+ previous_less_than_2_4_3_r5=$? |
87 |
+ |
88 |
+ if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \ |
89 |
+ [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then |
90 |
ebegin "Copy /etc/radiusclient to /etc/ppp/radius" |
91 |
cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius" |
92 |
eend $? |
93 |
@@ -282,7 +286,7 @@ |
94 |
# lib name has changed |
95 |
sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" |
96 |
|
97 |
- if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then |
98 |
+ if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then |
99 |
echo |
100 |
ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from" |
101 |
ewarn " /etc/radiusclient to /etc/ppp/radius." |
102 |
|
103 |
|
104 |
|
105 |
1.212 net-dialup/ppp/ChangeLog |
106 |
|
107 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ChangeLog?rev=1.212&view=markup |
108 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ChangeLog?rev=1.212&content-type=text/plain |
109 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/ppp/ChangeLog?r1=1.211&r2=1.212 |
110 |
|
111 |
Index: ChangeLog |
112 |
=================================================================== |
113 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v |
114 |
retrieving revision 1.211 |
115 |
retrieving revision 1.212 |
116 |
diff -u -r1.211 -r1.212 |
117 |
--- ChangeLog 14 May 2008 22:05:03 -0000 1.211 |
118 |
+++ ChangeLog 14 Jun 2008 16:54:53 -0000 1.212 |
119 |
@@ -1,6 +1,12 @@ |
120 |
# ChangeLog for net-dialup/ppp |
121 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
122 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.211 2008/05/14 22:05:03 flameeyes Exp $ |
123 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.212 2008/06/14 16:54:53 zmedico Exp $ |
124 |
+ |
125 |
+ 14 Jun 2008; Zac Medico <zmedico@g.o> ppp-2.4.4-r14.ebuild, |
126 |
+ ppp-2.4.4-r15.ebuild: |
127 |
+ Bug #226505 - For compatibility with phase execution order in |
128 |
+ >=portage-2.1.5, call has_version inside pkg_preinst instead of |
129 |
+ pkg_postinst. |
130 |
|
131 |
14 May 2008; Diego Pettenò <flameeyes@g.o> ppp-2.4.4-r15.ebuild: |
132 |
Depend on virtual/pam as the code builds fine with OpenPAM. |
133 |
|
134 |
|
135 |
|
136 |
-- |
137 |
gentoo-commits@l.g.o mailing list |