summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-firewall/iptables/Manifest30
-rw-r--r--net-firewall/iptables/files/ip6tables-1.2.9-r1.init68
-rw-r--r--net-firewall/iptables/files/ip6tables.init75
-rw-r--r--net-firewall/iptables/files/iptables-1.2.9-r1.init67
-rw-r--r--net-firewall/iptables/files/iptables.init74
5 files changed, 148 insertions, 166 deletions
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 7287217d6a6a..bd92ed3b875c 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,31 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 819ac2b60de164f661c0759578517de6 ChangeLog 16821
MD5 cdf47a369303ed0da3bb2f6888dc1aa8 iptables-1.2.7a-r3.ebuild 1982
MD5 d8db7c69648295e17016d8bbe4c55c07 iptables-1.2.9-r1.ebuild 3526
-MD5 5c9fe97964cdb981c75f43f20ba48c15 iptables-1.2.11-r2.ebuild 5379
MD5 e2158f065e3c8a603eb424a8ff613e4e iptables-1.2.9-r4.ebuild 5435
MD5 20d154d66f67db6a04208bda433d9823 iptables-1.2.9.ebuild 2805
MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 5c9fe97964cdb981c75f43f20ba48c15 iptables-1.2.11-r2.ebuild 5379
MD5 c3b7afaef1230c12fc9afbfadd53472b iptables-1.2.11-r3.ebuild 5514
MD5 c3837a503fead3e60811e7cd8ab3f1a1 iptables-1.3.1-r2.ebuild 5602
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68
MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r4 67
MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
-MD5 d01fea0fed4592571090b2fe958a395a files/ip6tables-1.2.9-r1.init 1878
-MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 abfb063fae350f729105aec89f18f0b4 files/ip6tables-1.2.9-r1.init 1793
MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 cc47b162c1a113d2de67762963ba7b0a files/ip6tables.init 2104
+MD5 6fcbeff4b5ce0f79f66265cb8af3d55f files/ip6tables.init 2020
MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
+MD5 4e055c59114fd6abc5a27bdaa97d2946 files/iptables-1.2.9-r1.confd 264
+MD5 c95cf8f2b5a1dbfb3f53df2714055988 files/iptables-1.2.9-r1.init 1778
MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
-MD5 23da9a56b3162ef3cd18fcc8cc45a33f files/iptables.init 2087
+MD5 6db1e09fe93492ab7a8590ca43cf56f5 files/iptables.init 2004
MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
-MD5 4e055c59114fd6abc5a27bdaa97d2946 files/iptables-1.2.9-r1.confd 264
-MD5 3ec239b461aa2724ec737824cf5615be files/iptables-1.2.9-r1.init 1842
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68
-MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r4 67
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r3 68
MD5 c237fdc6fd86d64642da7c9751d317af files/digest-iptables-1.3.1-r2 206
MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
@@ -50,10 +47,3 @@ MD5 bcbdd7e40a2fd78796c9a00a5ae463cb files/1.3.1-files/grsecurity-1.2.8-iptables
MD5 76a42dd64d1a4f419a5f07de5a6cb0c2 files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 1098
MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.3.1-files/install_ipv6_apps.patch.bz2 334
MD5 628b6569018552e77bd5543d98baa664 files/1.3.1-files/iptables-1.3.1-compilefix.patch 539
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZ5n8mdTrptrqvGERAuCIAJ9ORVELGhGyvbcsJBPtZWR2vwdkfACgiZ2r
-or81CSZmeDQw2eidjCxPGVg=
-=uj57
------END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
index dbf0c94cc19e..d30880ce3bd0 100644
--- a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.3 2004/08/18 22:08:21 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.4 2005/04/25 00:27:47 vapier Exp $
-opts="start stop save reload"
+opts="save reload"
depend() {
before net
@@ -20,7 +20,7 @@ checkrules() {
}
start() {
- checkrules || return 1
+ checkrules || return 1
ebegin "Loading ip6tables state and starting firewall"
einfo "Restoring ip6tables ruleset"
/sbin/ip6tables-restore ${SAVE_RESTORE_OPTIONS} < ${IP6TABLES_SAVE}
@@ -28,48 +28,46 @@ start() {
}
stop() {
- if [ "${SAVE_ON_STOP}" = "yes" ]; then
- save || return 1
- fi
+ if [ "${SAVE_ON_STOP}" = "yes" ]; then
+ save || return 1
+ fi
ebegin "Stopping firewall"
- for a in `cat /proc/net/ip6_tables_names`; do
- ip6tables -F -t $a
- ip6tables -X -t $a
+ for a in `cat /proc/net/ip6_tables_names`; do
+ ip6tables -F -t $a
+ ip6tables -X -t $a
- if [ $a == nat ]; then
- /sbin/ip6tables -t nat -P PREROUTING ACCEPT
- /sbin/ip6tables -t nat -P POSTROUTING ACCEPT
- /sbin/ip6tables -t nat -P OUTPUT ACCEPT
- elif [ $a == mangle ]; then
- /sbin/ip6tables -t mangle -P PREROUTING ACCEPT
- /sbin/ip6tables -t mangle -P INPUT ACCEPT
- /sbin/ip6tables -t mangle -P FORWARD ACCEPT
- /sbin/ip6tables -t mangle -P OUTPUT ACCEPT
- /sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
- elif [ $a == filter ]; then
- /sbin/ip6tables -t filter -P INPUT ACCEPT
- /sbin/ip6tables -t filter -P FORWARD ACCEPT
- /sbin/ip6tables -t filter -P OUTPUT ACCEPT
- fi
- done
+ if [ $a == nat ]; then
+ /sbin/ip6tables -t nat -P PREROUTING ACCEPT
+ /sbin/ip6tables -t nat -P POSTROUTING ACCEPT
+ /sbin/ip6tables -t nat -P OUTPUT ACCEPT
+ elif [ $a == mangle ]; then
+ /sbin/ip6tables -t mangle -P PREROUTING ACCEPT
+ /sbin/ip6tables -t mangle -P INPUT ACCEPT
+ /sbin/ip6tables -t mangle -P FORWARD ACCEPT
+ /sbin/ip6tables -t mangle -P OUTPUT ACCEPT
+ /sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
+ elif [ $a == filter ]; then
+ /sbin/ip6tables -t filter -P INPUT ACCEPT
+ /sbin/ip6tables -t filter -P FORWARD ACCEPT
+ /sbin/ip6tables -t filter -P OUTPUT ACCEPT
+ fi
+ done
eend $?
}
reload() {
ebegin "Flushing firewall"
- for a in `cat /proc/net/ip_tables_names`; do
- /sbin/ip6tables -F -t $a
- /sbin/ip6tables -X -t $a
- done;
+ for a in `cat /proc/net/ip_tables_names`; do
+ /sbin/ip6tables -F -t $a
+ /sbin/ip6tables -X -t $a
+ done
eend $?
start
}
-
save() {
- ebegin "Saving ip6tables state"
- /sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
- eend $?
+ ebegin "Saving ip6tables state"
+ /sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
+ eend $?
}
-
diff --git a/net-firewall/iptables/files/ip6tables.init b/net-firewall/iptables/files/ip6tables.init
index c51ccb424a08..6b6515001aac 100644
--- a/net-firewall/iptables/files/ip6tables.init
+++ b/net-firewall/iptables/files/ip6tables.init
@@ -1,10 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or
-# later
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables.init,v 1.5 2004/07/14 23:30:37 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables.init,v 1.6 2005/04/25 00:27:47 vapier Exp $
-opts="start stop save reload"
+opts="save reload"
depend() {
need logger net
@@ -20,7 +19,7 @@ checkrules() {
}
start() {
- checkrules || return 1
+ checkrules || return 1
ebegin "Loading ip6tables state and starting firewall"
einfo "Restoring ip6tables ruleset"
/sbin/ip6tables-restore ${SAVE_RESTORE_OPTIONS} < ${IP6TABLES_SAVE}
@@ -28,56 +27,54 @@ start() {
if [ "${ENABLE_FORWARDING_IPv6}" = "yes" ] ; then
einfo "Enabling forwarding for ipv6"
echo "1" > /proc/sys/net/ipv6/conf/all/forwarding
- fi
+ fi
eend $?
}
stop() {
ebegin "Stopping firewall"
- # set sane defaults that disable forwarding
- if [ -f /proc/sys/net/ipv6/conf/all/forwarding ] ; then
- echo "0" > /proc/sys/net/ipv6/conf/all/forwarding
- fi
+ # set sane defaults that disable forwarding
+ if [ -f /proc/sys/net/ipv6/conf/all/forwarding ] ; then
+ echo "0" > /proc/sys/net/ipv6/conf/all/forwarding
+ fi
- for a in `cat /proc/net/ip6_tables_names`; do
- ip6tables -F -t $a
- ip6tables -X -t $a
+ for a in `cat /proc/net/ip6_tables_names`; do
+ ip6tables -F -t $a
+ ip6tables -X -t $a
- if [ $a == nat ]; then
- /sbin/ip6tables -t nat -P PREROUTING ACCEPT
- /sbin/ip6tables -t nat -P POSTROUTING ACCEPT
- /sbin/ip6tables -t nat -P OUTPUT ACCEPT
- elif [ $a == mangle ]; then
- /sbin/ip6tables -t mangle -P PREROUTING ACCEPT
- /sbin/ip6tables -t mangle -P INPUT ACCEPT
- /sbin/ip6tables -t mangle -P FORWARD ACCEPT
- /sbin/ip6tables -t mangle -P OUTPUT ACCEPT
- /sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
- elif [ $a == filter ]; then
- /sbin/ip6tables -t filter -P INPUT ACCEPT
- /sbin/ip6tables -t filter -P FORWARD ACCEPT
- /sbin/ip6tables -t filter -P OUTPUT ACCEPT
- fi
- done
+ if [ $a == nat ]; then
+ /sbin/ip6tables -t nat -P PREROUTING ACCEPT
+ /sbin/ip6tables -t nat -P POSTROUTING ACCEPT
+ /sbin/ip6tables -t nat -P OUTPUT ACCEPT
+ elif [ $a == mangle ]; then
+ /sbin/ip6tables -t mangle -P PREROUTING ACCEPT
+ /sbin/ip6tables -t mangle -P INPUT ACCEPT
+ /sbin/ip6tables -t mangle -P FORWARD ACCEPT
+ /sbin/ip6tables -t mangle -P OUTPUT ACCEPT
+ /sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
+ elif [ $a == filter ]; then
+ /sbin/ip6tables -t filter -P INPUT ACCEPT
+ /sbin/ip6tables -t filter -P FORWARD ACCEPT
+ /sbin/ip6tables -t filter -P OUTPUT ACCEPT
+ fi
+ done
eend $?
}
reload() {
ebegin "Flushing firewall"
- for a in `cat /proc/net/ip6_tables_names`; do
- /sbin/ip6tables -F -t $a
- /sbin/ip6tables -X -t $a
- done;
+ for a in `cat /proc/net/ip6_tables_names`; do
+ /sbin/ip6tables -F -t $a
+ /sbin/ip6tables -X -t $a
+ done
eend $?
start
}
-
save() {
- ebegin "Saving ip6tables state"
- /sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
- eend $?
+ ebegin "Saving ip6tables state"
+ /sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
+ eend $?
}
-
diff --git a/net-firewall/iptables/files/iptables-1.2.9-r1.init b/net-firewall/iptables/files/iptables-1.2.9-r1.init
index 80662f176858..9c96a242f0c9 100644
--- a/net-firewall/iptables/files/iptables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/iptables-1.2.9-r1.init
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.3 2004/08/18 22:08:21 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.4 2005/04/25 00:27:47 vapier Exp $
-opts="start stop save reload"
+opts="save reload"
depend() {
before net
@@ -20,10 +20,10 @@ checkrules() {
}
start() {
- checkrules || return 1
+ checkrules || return 1
ebegin "Loading iptables state and starting firewall"
einfo "Restoring iptables ruleset"
- /sbin/iptables-restore ${SAVE_RESTORE_OPTIONS} < ${IPTABLES_SAVE}
+ /sbin/iptables-restore ${SAVE_RESTORE_OPTIONS} < ${IPTABLES_SAVE}
eend $?
}
@@ -32,43 +32,42 @@ stop() {
save || return 1
fi
ebegin "Stopping firewall"
- for a in `cat /proc/net/ip_tables_names`; do
- /sbin/iptables -F -t $a
- /sbin/iptables -X -t $a
-
- if [ $a == nat ]; then
- /sbin/iptables -t nat -P PREROUTING ACCEPT
- /sbin/iptables -t nat -P POSTROUTING ACCEPT
- /sbin/iptables -t nat -P OUTPUT ACCEPT
- elif [ $a == mangle ]; then
- /sbin/iptables -t mangle -P PREROUTING ACCEPT
- /sbin/iptables -t mangle -P INPUT ACCEPT
- /sbin/iptables -t mangle -P FORWARD ACCEPT
- /sbin/iptables -t mangle -P OUTPUT ACCEPT
- /sbin/iptables -t mangle -P POSTROUTING ACCEPT
- elif [ $a == filter ]; then
- /sbin/iptables -t filter -P INPUT ACCEPT
- /sbin/iptables -t filter -P FORWARD ACCEPT
- /sbin/iptables -t filter -P OUTPUT ACCEPT
- fi
- done
+ for a in `cat /proc/net/ip_tables_names`; do
+ /sbin/iptables -F -t $a
+ /sbin/iptables -X -t $a
+
+ if [ $a == nat ]; then
+ /sbin/iptables -t nat -P PREROUTING ACCEPT
+ /sbin/iptables -t nat -P POSTROUTING ACCEPT
+ /sbin/iptables -t nat -P OUTPUT ACCEPT
+ elif [ $a == mangle ]; then
+ /sbin/iptables -t mangle -P PREROUTING ACCEPT
+ /sbin/iptables -t mangle -P INPUT ACCEPT
+ /sbin/iptables -t mangle -P FORWARD ACCEPT
+ /sbin/iptables -t mangle -P OUTPUT ACCEPT
+ /sbin/iptables -t mangle -P POSTROUTING ACCEPT
+ elif [ $a == filter ]; then
+ /sbin/iptables -t filter -P INPUT ACCEPT
+ /sbin/iptables -t filter -P FORWARD ACCEPT
+ /sbin/iptables -t filter -P OUTPUT ACCEPT
+ fi
+ done
eend $?
}
reload() {
ebegin "Flushing firewall"
- for a in `cat /proc/net/ip_tables_names`; do
- /sbin/iptables -F -t $a
- /sbin/iptables -X -t $a
- done;
- eend $?
+ for a in `cat /proc/net/ip_tables_names`; do
+ /sbin/iptables -F -t $a
+ /sbin/iptables -X -t $a
+ done;
+ eend $?
start
}
save() {
- ebegin "Saving iptables state"
- /sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
- eend $?
+ ebegin "Saving iptables state"
+ /sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
+ eend $?
}
-
diff --git a/net-firewall/iptables/files/iptables.init b/net-firewall/iptables/files/iptables.init
index db7a9a22726f..cc9e49950f74 100644
--- a/net-firewall/iptables/files/iptables.init
+++ b/net-firewall/iptables/files/iptables.init
@@ -1,10 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or
-# later
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables.init,v 1.4 2004/07/14 23:30:37 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables.init,v 1.5 2005/04/25 00:27:47 vapier Exp $
-opts="start stop save reload"
+opts="save reload"
depend() {
need logger net
@@ -20,7 +19,7 @@ checkrules() {
}
start() {
- checkrules || return 1
+ checkrules || return 1
ebegin "Loading iptables state and starting firewall"
einfo "Restoring iptables ruleset"
/sbin/iptables-restore ${SAVE_RESTORE_OPTIONS} < ${IPTABLES_SAVE}
@@ -35,48 +34,47 @@ start() {
stop() {
ebegin "Stopping firewall"
- # set sane defaults that disable forwarding
- if [ -f /proc/sys/net/ipv4/conf/all/forwarding ] ; then
- echo "0" > /proc/sys/net/ipv4/conf/all/forwarding
- fi
+ # set sane defaults that disable forwarding
+ if [ -f /proc/sys/net/ipv4/conf/all/forwarding ] ; then
+ echo "0" > /proc/sys/net/ipv4/conf/all/forwarding
+ fi
- for a in `cat /proc/net/ip_tables_names`; do
- /sbin/iptables -F -t $a
- /sbin/iptables -X -t $a
+ for a in `cat /proc/net/ip_tables_names`; do
+ /sbin/iptables -F -t $a
+ /sbin/iptables -X -t $a
- if [ $a == nat ]; then
- /sbin/iptables -t nat -P PREROUTING ACCEPT
- /sbin/iptables -t nat -P POSTROUTING ACCEPT
- /sbin/iptables -t nat -P OUTPUT ACCEPT
- elif [ $a == mangle ]; then
- /sbin/iptables -t mangle -P PREROUTING ACCEPT
- /sbin/iptables -t mangle -P INPUT ACCEPT
- /sbin/iptables -t mangle -P FORWARD ACCEPT
- /sbin/iptables -t mangle -P OUTPUT ACCEPT
- /sbin/iptables -t mangle -P POSTROUTING ACCEPT
- elif [ $a == filter ]; then
- /sbin/iptables -t filter -P INPUT ACCEPT
- /sbin/iptables -t filter -P FORWARD ACCEPT
- /sbin/iptables -t filter -P OUTPUT ACCEPT
- fi
- done
+ if [ $a == nat ]; then
+ /sbin/iptables -t nat -P PREROUTING ACCEPT
+ /sbin/iptables -t nat -P POSTROUTING ACCEPT
+ /sbin/iptables -t nat -P OUTPUT ACCEPT
+ elif [ $a == mangle ]; then
+ /sbin/iptables -t mangle -P PREROUTING ACCEPT
+ /sbin/iptables -t mangle -P INPUT ACCEPT
+ /sbin/iptables -t mangle -P FORWARD ACCEPT
+ /sbin/iptables -t mangle -P OUTPUT ACCEPT
+ /sbin/iptables -t mangle -P POSTROUTING ACCEPT
+ elif [ $a == filter ]; then
+ /sbin/iptables -t filter -P INPUT ACCEPT
+ /sbin/iptables -t filter -P FORWARD ACCEPT
+ /sbin/iptables -t filter -P OUTPUT ACCEPT
+ fi
+ done
eend $?
}
reload() {
ebegin "Flushing firewall"
- for a in `cat /proc/net/ip_tables_names`; do
- /sbin/iptables -F -t $a
- /sbin/iptables -X -t $a
- done;
- eend $?
+ for a in `cat /proc/net/ip_tables_names`; do
+ /sbin/iptables -F -t $a
+ /sbin/iptables -X -t $a
+ done
+ eend $?
start
}
save() {
- ebegin "Saving iptables state"
- /sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
- eend $?
+ ebegin "Saving iptables state"
+ /sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
+ eend $?
}
-