| 1 |
commit: 54f3752b3fb9ded157bdc634cc40998750bca525 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> whissi <DOT> de> |
| 3 |
AuthorDate: Tue Aug 2 12:59:43 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 08:01:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f3752b |
| 7 |
|
| 8 |
net-firewall/shorewall: Fix REPLACING_VERSIONS usage |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/589482 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/2000 |
| 14 |
|
| 15 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 16 |
|
| 17 |
net-firewall/shorewall/shorewall-5.0.10.ebuild | 40 ++++++++++++++----------- |
| 18 |
net-firewall/shorewall/shorewall-5.0.4.ebuild | 40 ++++++++++++++----------- |
| 19 |
net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 40 ++++++++++++++----------- |
| 20 |
net-firewall/shorewall/shorewall-5.0.9.2.ebuild | 40 ++++++++++++++----------- |
| 21 |
4 files changed, 92 insertions(+), 68 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-firewall/shorewall/shorewall-5.0.10.ebuild b/net-firewall/shorewall/shorewall-5.0.10.ebuild |
| 24 |
index f87c043..011c75d 100644 |
| 25 |
--- a/net-firewall/shorewall/shorewall-5.0.10.ebuild |
| 26 |
+++ b/net-firewall/shorewall/shorewall-5.0.10.ebuild |
| 27 |
@@ -400,29 +400,35 @@ pkg_postinst() { |
| 28 |
|
| 29 |
fi |
| 30 |
|
| 31 |
- if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then |
| 32 |
- # This is an upgrade |
| 33 |
+ local v |
| 34 |
+ for v in ${REPLACING_VERSIONS}; do |
| 35 |
+ if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then |
| 36 |
+ # This is an upgrade |
| 37 |
|
| 38 |
- elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 39 |
- elog "" |
| 40 |
- elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 41 |
- elog " - http://shorewall.net/upgrade_issues.htm#idp8704902640" |
| 42 |
- |
| 43 |
- if use ipv4; then |
| 44 |
- elog "" |
| 45 |
- elog "You can auto-migrate your configuration using" |
| 46 |
+ elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 47 |
elog "" |
| 48 |
- elog " # shorewall update -A" |
| 49 |
+ elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 50 |
+ elog " - http://shorewall.net/Shorewall-5.html#idp51151872" |
| 51 |
|
| 52 |
- if use ipv6; then |
| 53 |
- elog " # shorewall6 update -A" |
| 54 |
+ if use ipv4; then |
| 55 |
+ elog "" |
| 56 |
+ elog "You can auto-migrate your configuration using" |
| 57 |
+ elog "" |
| 58 |
+ elog " # shorewall update -A" |
| 59 |
+ |
| 60 |
+ if use ipv6; then |
| 61 |
+ elog " # shorewall6 update -A" |
| 62 |
+ fi |
| 63 |
+ |
| 64 |
+ elog "" |
| 65 |
+ elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 66 |
+ elog "please read the shorewall[6] man page first." |
| 67 |
fi |
| 68 |
|
| 69 |
- elog "" |
| 70 |
- elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 71 |
- elog "please read the shorewall[6] man page first." |
| 72 |
+ # Show this elog only once |
| 73 |
+ break |
| 74 |
fi |
| 75 |
- fi |
| 76 |
+ done |
| 77 |
|
| 78 |
if ! use init; then |
| 79 |
elog "" |
| 80 |
|
| 81 |
diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild |
| 82 |
index 0c749b3..5600489 100644 |
| 83 |
--- a/net-firewall/shorewall/shorewall-5.0.4.ebuild |
| 84 |
+++ b/net-firewall/shorewall/shorewall-5.0.4.ebuild |
| 85 |
@@ -400,29 +400,35 @@ pkg_postinst() { |
| 86 |
|
| 87 |
fi |
| 88 |
|
| 89 |
- if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then |
| 90 |
- # This is an upgrade |
| 91 |
+ local v |
| 92 |
+ for v in ${REPLACING_VERSIONS}; do |
| 93 |
+ if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then |
| 94 |
+ # This is an upgrade |
| 95 |
|
| 96 |
- elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 97 |
- elog "" |
| 98 |
- elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 99 |
- elog " - http://shorewall.net/upgrade_issues.htm#idp8704902640" |
| 100 |
- |
| 101 |
- if use ipv4; then |
| 102 |
- elog "" |
| 103 |
- elog "You can auto-migrate your configuration using" |
| 104 |
+ elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 105 |
elog "" |
| 106 |
- elog " # shorewall update -A" |
| 107 |
+ elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 108 |
+ elog " - http://shorewall.net/Shorewall-5.html#idp51151872" |
| 109 |
|
| 110 |
- if use ipv6; then |
| 111 |
- elog " # shorewall6 update -A" |
| 112 |
+ if use ipv4; then |
| 113 |
+ elog "" |
| 114 |
+ elog "You can auto-migrate your configuration using" |
| 115 |
+ elog "" |
| 116 |
+ elog " # shorewall update -A" |
| 117 |
+ |
| 118 |
+ if use ipv6; then |
| 119 |
+ elog " # shorewall6 update -A" |
| 120 |
+ fi |
| 121 |
+ |
| 122 |
+ elog "" |
| 123 |
+ elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 124 |
+ elog "please read the shorewall[6] man page first." |
| 125 |
fi |
| 126 |
|
| 127 |
- elog "" |
| 128 |
- elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 129 |
- elog "please read the shorewall[6] man page first." |
| 130 |
+ # Show this elog only once |
| 131 |
+ break |
| 132 |
fi |
| 133 |
- fi |
| 134 |
+ done |
| 135 |
|
| 136 |
if ! use init; then |
| 137 |
elog "" |
| 138 |
|
| 139 |
diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild |
| 140 |
index 879e1b5..112aa20 100644 |
| 141 |
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild |
| 142 |
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild |
| 143 |
@@ -400,29 +400,35 @@ pkg_postinst() { |
| 144 |
|
| 145 |
fi |
| 146 |
|
| 147 |
- if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then |
| 148 |
- # This is an upgrade |
| 149 |
+ local v |
| 150 |
+ for v in ${REPLACING_VERSIONS}; do |
| 151 |
+ if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then |
| 152 |
+ # This is an upgrade |
| 153 |
|
| 154 |
- elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 155 |
- elog "" |
| 156 |
- elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 157 |
- elog " - http://shorewall.net/upgrade_issues.htm#idp8704902640" |
| 158 |
- |
| 159 |
- if use ipv4; then |
| 160 |
- elog "" |
| 161 |
- elog "You can auto-migrate your configuration using" |
| 162 |
+ elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 163 |
elog "" |
| 164 |
- elog " # shorewall update -A" |
| 165 |
+ elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 166 |
+ elog " - http://shorewall.net/Shorewall-5.html#idp51151872" |
| 167 |
|
| 168 |
- if use ipv6; then |
| 169 |
- elog " # shorewall6 update -A" |
| 170 |
+ if use ipv4; then |
| 171 |
+ elog "" |
| 172 |
+ elog "You can auto-migrate your configuration using" |
| 173 |
+ elog "" |
| 174 |
+ elog " # shorewall update -A" |
| 175 |
+ |
| 176 |
+ if use ipv6; then |
| 177 |
+ elog " # shorewall6 update -A" |
| 178 |
+ fi |
| 179 |
+ |
| 180 |
+ elog "" |
| 181 |
+ elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 182 |
+ elog "please read the shorewall[6] man page first." |
| 183 |
fi |
| 184 |
|
| 185 |
- elog "" |
| 186 |
- elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 187 |
- elog "please read the shorewall[6] man page first." |
| 188 |
+ # Show this elog only once |
| 189 |
+ break |
| 190 |
fi |
| 191 |
- fi |
| 192 |
+ done |
| 193 |
|
| 194 |
if ! use init; then |
| 195 |
elog "" |
| 196 |
|
| 197 |
diff --git a/net-firewall/shorewall/shorewall-5.0.9.2.ebuild b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild |
| 198 |
index f87c043..011c75d 100644 |
| 199 |
--- a/net-firewall/shorewall/shorewall-5.0.9.2.ebuild |
| 200 |
+++ b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild |
| 201 |
@@ -400,29 +400,35 @@ pkg_postinst() { |
| 202 |
|
| 203 |
fi |
| 204 |
|
| 205 |
- if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then |
| 206 |
- # This is an upgrade |
| 207 |
+ local v |
| 208 |
+ for v in ${REPLACING_VERSIONS}; do |
| 209 |
+ if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then |
| 210 |
+ # This is an upgrade |
| 211 |
|
| 212 |
- elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 213 |
- elog "" |
| 214 |
- elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 215 |
- elog " - http://shorewall.net/upgrade_issues.htm#idp8704902640" |
| 216 |
- |
| 217 |
- if use ipv4; then |
| 218 |
- elog "" |
| 219 |
- elog "You can auto-migrate your configuration using" |
| 220 |
+ elog "You are upgrading from a previous major version. It is highly recommended that you read" |
| 221 |
elog "" |
| 222 |
- elog " # shorewall update -A" |
| 223 |
+ elog " - /usr/share/doc/shorewall*/releasenotes.tx*" |
| 224 |
+ elog " - http://shorewall.net/Shorewall-5.html#idp51151872" |
| 225 |
|
| 226 |
- if use ipv6; then |
| 227 |
- elog " # shorewall6 update -A" |
| 228 |
+ if use ipv4; then |
| 229 |
+ elog "" |
| 230 |
+ elog "You can auto-migrate your configuration using" |
| 231 |
+ elog "" |
| 232 |
+ elog " # shorewall update -A" |
| 233 |
+ |
| 234 |
+ if use ipv6; then |
| 235 |
+ elog " # shorewall6 update -A" |
| 236 |
+ fi |
| 237 |
+ |
| 238 |
+ elog "" |
| 239 |
+ elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 240 |
+ elog "please read the shorewall[6] man page first." |
| 241 |
fi |
| 242 |
|
| 243 |
- elog "" |
| 244 |
- elog "But if you are not familiar with the \"shorewall[6] update\" command," |
| 245 |
- elog "please read the shorewall[6] man page first." |
| 246 |
+ # Show this elog only once |
| 247 |
+ break |
| 248 |
fi |
| 249 |
- fi |
| 250 |
+ done |
| 251 |
|
| 252 |
if ! use init; then |
| 253 |
elog "" |
Archives