Compare commits
No commits in common. "imports/c9-beta/ipset-7.11-5.el9" and "c8s" have entirely different histories.
imports/c9
...
c8s
|
|
@ -1 +1 @@
|
|||
SOURCES/ipset-7.11.tar.bz2
|
||||
SOURCES/ipset-7.1.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
a10e4e8f0ed2fa540b653d987a93069c0c276f61 SOURCES/ipset-7.11.tar.bz2
|
||||
ed687efcc7f3a1117cc01d6a29639f9d604f2a04 SOURCES/ipset-7.1.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
From e9398b721855f8fbfb30a21d475d0aeb7f85bbe5 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Sutter <psutter@redhat.com>
|
||||
Date: Fri, 25 Jun 2021 13:47:57 +0200
|
||||
Subject: [PATCH] Add deprecation notice to ipset.8
|
||||
|
||||
This is RHEL9 trying to friendly kick people towards nftables.
|
||||
---
|
||||
src/ipset.8 | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/ipset.8 b/src/ipset.8
|
||||
index 97cece9fb04b5..d68e9bbc22891 100644
|
||||
--- a/src/ipset.8
|
||||
+++ b/src/ipset.8
|
||||
@@ -51,6 +51,18 @@ COMMANDS := { \fBcreate\fR | \fBadd\fR | \fBdel\fR | \fBtest\fR | \fBdestroy\fR
|
||||
.PP
|
||||
\fBipset\fR \fB\-\fR
|
||||
.SH "DESCRIPTION"
|
||||
+This tool is
|
||||
+.B deprecated
|
||||
+in Red Hat Enterprise Linux. It is maintenance only and will not receive new
|
||||
+features. New setups should use
|
||||
+.BR nft (8).
|
||||
+Existing setups should migrate to
|
||||
+.BR nft (8)
|
||||
+when possible. See
|
||||
+.UR https://red.ht/nft_your_tables
|
||||
+.UE
|
||||
+for details.
|
||||
+.PP
|
||||
\fBipset\fR
|
||||
is used to set up, maintain and inspect so called IP sets in the Linux
|
||||
kernel. Depending on the type of the set, an IP set may store IP(v4/v6)
|
||||
@@ -1099,8 +1111,9 @@ Bugs? No, just funny features. :\-)
|
||||
OK, just kidding...
|
||||
.SH "SEE ALSO"
|
||||
\fBiptables\fR(8),
|
||||
-\fBip6tables\fR(8)
|
||||
-\fBiptables-extensions\fR(8)
|
||||
+\fBip6tables\fR(8),
|
||||
+\fBiptables-extensions\fR(8),
|
||||
+\fBnft\fR(8)
|
||||
.SH "AUTHORS"
|
||||
Jozsef Kadlecsik wrote ipset, which is based on ippool by
|
||||
Joakim Axelsson, Patrick Schaaf and Martin Josefsson.
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# Save current ipsets on stop.
|
||||
# Value: yes|no, default: no
|
||||
# Saves all ipsets to /etc/ipset/ipset if service gets stopped
|
||||
# (e.g. on system shutdown).
|
||||
IPSET_SAVE_ON_STOP="no"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/bash
|
||||
exec /usr/libexec/ipset/ipset.start-stop save
|
||||
|
|
@ -9,10 +9,11 @@ RemainAfterExit=yes
|
|||
ExecStart=/usr/libexec/ipset/ipset.start-stop start
|
||||
ExecStop=/usr/libexec/ipset/ipset.start-stop stop
|
||||
ExecReload=/usr/libexec/ipset/ipset.start-stop reload
|
||||
# Save current ipset entries on stop/restart.
|
||||
# Save current ipset entries on stop.
|
||||
# Value: yes|no, default: no
|
||||
# Saves all ipsets to /etc/ipset/ipset if ipset gets stopped
|
||||
Environment=IPSET_SAVE_ON_STOP=no IPSET_SAVE_ON_RESTART=no
|
||||
# Saves all ipsets to /etc/sysconfig/ipset if ipset gets stopped
|
||||
Environment=IPSET_SAVE_ON_STOP=no
|
||||
EnvironmentFile=-/etc/sysconfig/ipset-config
|
||||
|
||||
[Install]
|
||||
WantedBy=basic.target
|
||||
|
|
|
|||
|
|
@ -1,209 +1,353 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
#
|
||||
# ipset Start and stop ipset firewall sets
|
||||
#
|
||||
# config: /etc/ipset/ipset
|
||||
#
|
||||
# config: /etc/sysconfig/ipset-config
|
||||
|
||||
IPSET=ipset
|
||||
IPSET_BIN=/usr/sbin/${IPSET}
|
||||
IPSET_DATA=/etc/${IPSET}/${IPSET}
|
||||
IPSET_BIN=/usr/sbin/ipset
|
||||
IPSET_CONFIG=/etc/sysconfig/ipset-config
|
||||
IPSET_DATA_COMPAT=/etc/sysconfig/ipset
|
||||
IPSET_DATA_COMPAT_BACKUP=${IPSET_DATA_COMPAT}.save
|
||||
IPSET_DATA_DIR=/etc/sysconfig/ipset.d
|
||||
IPSET_DATA_DIR_BACKUP=${IPSET_DATA_DIR}.save
|
||||
IPSET_DATA_SAVED_FLAG=${IPSET_DATA_DIR}/.saved
|
||||
IPSET_LOCK=/run/ipset.lock
|
||||
IPSET_RUN=/run/ipset.run
|
||||
CLEAN_FILES=""
|
||||
|
||||
IPTABLES_CONFIG=/etc/sysconfig/iptables-config
|
||||
IP6TABLES_CONFIG=${IPTABLES_CONFIG/iptables/ip6tables}
|
||||
trap "rm -rf \${CLEAN_FILES}" EXIT
|
||||
|
||||
TMP_FIFO=/tmp/${IPSET}.$$
|
||||
|
||||
if [[ ! -x ${IPSET_BIN} ]]; then
|
||||
echo "${IPSET_BIN} does not exist."
|
||||
exit 5
|
||||
fi
|
||||
|
||||
CLEAN_FILES=TMP_FIFO
|
||||
trap "rm -f \$CLEAN_FILES" EXIT
|
||||
|
||||
# Default ipset configuration:
|
||||
[[ -z $IPSET_SAVE_ON_STOP ]] && IPSET_SAVE_ON_STOP=no # Overridden by ip(6)tables IP(6)TABLES_SAVE_ON_STOP
|
||||
[[ -z $IPSET_SAVE_ON_RESTART ]] && IPSET_SAVE_ON_RESTART=no # Overridden by ip(6)tables IP(6)TABLES_SAVE_ON_RESTART
|
||||
|
||||
# Load iptables configuration(s)
|
||||
[[ -f "$IPTABLES_CONFIG" ]] && . "$IPTABLES_CONFIG"
|
||||
[[ -f "$IP6TABLES_CONFIG" ]] && . "$IP6TABLES_CONFIG"
|
||||
|
||||
# It doesn't make sense to save iptables config and not our config
|
||||
[[ ${IPTABLES_SAVE_ON_STOP} = yes || ${IP6TABLES_SAVE_ON_STOP} = yes ]] && IPSET_SAVE_ON_STOP=yes
|
||||
[[ ${IPTABLES_SAVE_ON_RESTART} = yes || ${IP6TABLES_SAVE_ON_RESTART} = yes ]] && IPSET_SAVE_ON_RESTART=yes
|
||||
|
||||
check_can_unload() {
|
||||
# If the xt_set module is loaded and can't be unloaded, then iptables is
|
||||
# using ipsets, so refuse to stop the service.
|
||||
if [[ -n $(lsmod | grep "^xt_set ") ]]; then
|
||||
rmmod xt_set 2>/dev/null
|
||||
[[ $? -ne 0 ]] && echo Current iptables configuration requires ipsets && return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
info() {
|
||||
echo "ipset: ${*}" >&2
|
||||
}
|
||||
|
||||
flush_n_delete() {
|
||||
local ret=0 set
|
||||
|
||||
# Flush sets
|
||||
${IPSET_BIN} flush
|
||||
let ret+=$?
|
||||
|
||||
# Delete ipset sets. If we don't do them individually, then none
|
||||
# will be deleted unless they all can be.
|
||||
for set in $(${IPSET_BIN} list -name); do
|
||||
${IPSET_BIN} destroy 2>/dev/null
|
||||
[[ $? -ne 0 ]] && ret=1
|
||||
done
|
||||
|
||||
return $ret
|
||||
warn() {
|
||||
echo "<4>ipset: ${*}" >&2
|
||||
}
|
||||
|
||||
start_clean()
|
||||
{
|
||||
mkfifo -m go= "${TMP_FIFO}"
|
||||
[[ $? -ne 0 ]] && return 1
|
||||
|
||||
# Get the lists of sets in current(old) config and new config
|
||||
old_sets="$(${IPSET_BIN} list -name | sort -u)"
|
||||
new_sets="$(grep ^create "${IPSET_DATA}" | cut -d " " -f 2 | sort -u)"
|
||||
|
||||
# List of sets no longer wanted
|
||||
drop_sets="$( printf "%s\n" "${old_sets}" > "${TMP_FIFO}" &
|
||||
printf "%s\n" "${new_sets}" | comm -23 "${TMP_FIFO}" -
|
||||
)"
|
||||
|
||||
# Get rid of sets no longer needed
|
||||
# Unfortunately -! doesn't work for destroy, so we have to do it a command at a time
|
||||
for dset in $drop_sets; do
|
||||
ipset destroy $dset 2>/dev/null
|
||||
# If it won't go - ? in use by iptables, just clear it
|
||||
[[ $? -ne 0 ]] && ipset flush $dset
|
||||
done
|
||||
|
||||
# Now delete the set members no longer required
|
||||
${IPSET_BIN} save | grep "^add " | sort >${TMP_FIFO} &
|
||||
grep "^add " ${IPSET_DATA} | sort | comm -23 ${TMP_FIFO} - | sed -e "s/^add /del /" \
|
||||
| ${IPSET_BIN} restore -!
|
||||
|
||||
# At last we can add the set members we haven't got
|
||||
ipset restore -! <${IPSET_DATA}
|
||||
|
||||
rm ${TMP_FIFO}
|
||||
|
||||
return 0
|
||||
err() {
|
||||
echo "<3>ipset: ${*}" >&2
|
||||
}
|
||||
|
||||
start() {
|
||||
# Do not start if there is no config file.
|
||||
[[ ! -f "$IPSET_DATA" ]] && echo "Loaded with no configuration" && return 0
|
||||
[ -x ${IPSET_BIN} ] || { err "Cannot execute ${IPSET_BIN}"; exit 1; }
|
||||
|
||||
# We can skip the first bit and do a simple load if
|
||||
# there is no current ipset configuration
|
||||
res=1
|
||||
if [[ -n $(${IPSET_BIN} list -name) ]]; then
|
||||
# The following may fail for some bizarre reason
|
||||
start_clean
|
||||
res=$?
|
||||
# Source ipset configuration
|
||||
# shellcheck source=ipset-config
|
||||
[ -f ${IPSET_CONFIG} ] && . ${IPSET_CONFIG}
|
||||
|
||||
[[ $res -ne 0 ]] && echo "Some old configuration may remain"
|
||||
fi
|
||||
set -f
|
||||
|
||||
# res -ne 0 => either start_clean failed, or we didn't need to run it
|
||||
if [[ $res -ne 0 ]]; then
|
||||
# This is the easy way to start but would leave any old
|
||||
# entries still configured. Still, better than nothing -
|
||||
# but fine if we had no config
|
||||
${IPSET_BIN} restore -! <${IPSET_DATA}
|
||||
res=$?
|
||||
fi
|
||||
|
||||
if [[ $res -ne 0 ]]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Nothing to stop if ip_set module is not loaded.
|
||||
lsmod | grep -q "^ip_set "
|
||||
[[ $? -ne 0 ]] && return 6
|
||||
|
||||
flush_n_delete
|
||||
[[ $? -ne 0 ]] && echo Warning: Not all sets were flushed/deleted
|
||||
|
||||
return 0
|
||||
lock() {
|
||||
CLEAN_FILES="${CLEAN_FILES} ${IPSET_LOCK}"
|
||||
until mkdir ${IPSET_LOCK} 2>/dev/null; do :; done
|
||||
}
|
||||
|
||||
save() {
|
||||
# Do not save if ip_set module is not loaded.
|
||||
lsmod | grep -q "^ip_set "
|
||||
[[ $? -ne 0 ]] && return 6
|
||||
fail=0
|
||||
|
||||
[[ -z $(${IPSET_BIN} list -name) ]] && return 0
|
||||
# Make backups of existing configuration first, if any
|
||||
[ -d ${IPSET_DATA_DIR} ] && mv -Tf ${IPSET_DATA_DIR} ${IPSET_DATA_DIR_BACKUP}
|
||||
[ -f ${IPSET_DATA_COMPAT} ] && mv -Tf ${IPSET_DATA_COMPAT} ${IPSET_DATA_COMPAT_BACKUP}
|
||||
|
||||
ret=0
|
||||
TMP_FILE=$(/bin/mktemp -q /tmp/$IPSET.XXXXXX) \
|
||||
&& CLEAN_FILES+=" $TMP_FILE" \
|
||||
&& chmod 600 "$TMP_FILE" \
|
||||
&& ${IPSET_BIN} save > $TMP_FILE 2>/dev/null \
|
||||
&& [[ -s $TMP_FILE ]] \
|
||||
|| ret=1
|
||||
rm -f ${IPSET_DATA_SAVED_FLAG}
|
||||
|
||||
if [[ $ret -eq 0 ]]; then
|
||||
# No need to do anything if the files are the same
|
||||
if [[ ! -f $IPSET_DATA ]]; then
|
||||
mv $TMP_FILE $IPSET_DATA && chmod 600 $IPSET_DATA || ret=1
|
||||
else
|
||||
diff -q $TMP_FILE $IPSET_DATA >/dev/null
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
if [[ -f $IPSET_DATA ]]; then
|
||||
cp -f --preserve=timestamps $IPSET_DATA $IPSET_DATA.save \
|
||||
&& chmod 600 $IPSET_DATA.save \
|
||||
|| ret=1
|
||||
# Save each set in a separate file
|
||||
mkdir -p ${IPSET_DATA_DIR}
|
||||
chmod 0700 ${IPSET_DATA_DIR}
|
||||
IFS="
|
||||
"
|
||||
for set in $(${IPSET_BIN} list -n -t); do
|
||||
# Empty name allowed, use ".set" as suffix. 'ipset save' doesn't
|
||||
# quote set names with spaces: if we have a space in the name,
|
||||
# work around this by quoting it ourselves in the output.
|
||||
# shellcheck disable=SC2003 # No POSIX equivalent to expr index
|
||||
if expr index "${set}" " " >/dev/null; then
|
||||
:> "${IPSET_DATA_DIR}/${set}.set"
|
||||
for line in $(${IPSET_BIN} save "${set}"); do
|
||||
create=0
|
||||
echo "${line}" | grep -q "^create " && create=1
|
||||
if [ $create -eq 1 ]; then
|
||||
line=${line#create *}
|
||||
else
|
||||
line=${line#add *}
|
||||
fi
|
||||
line=${line#${set} *}
|
||||
set="$(echo "${set}" | sed 's/"/\\"/g')"
|
||||
if [ $create -eq 1 ]; then
|
||||
echo "create \"${set}\" ${line}" >> "${IPSET_DATA_DIR}/${set}.set"
|
||||
else
|
||||
echo "add \"${set}\" ${line}" >> "${IPSET_DATA_DIR}/${set}.set"
|
||||
fi
|
||||
done
|
||||
else
|
||||
${IPSET_BIN} save "${set}" > "${IPSET_DATA_DIR}/${set}.set" || fail=1
|
||||
fi
|
||||
if [[ $ret -eq 0 ]]; then
|
||||
cp -f --preserve=timestamps $TMP_FILE $IPSET_DATA \
|
||||
&& chmod 600 $IPSET_DATA \
|
||||
|| ret=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
[ -f "${IPSET_DATA_DIR}/${set}.set" ] && chmod 600 "${IPSET_DATA_DIR}/${set}.set"
|
||||
[ $fail -eq 1 ] && err "Cannot save set ${set}" && unset IFS && return 1
|
||||
done
|
||||
touch ${IPSET_DATA_SAVED_FLAG} || { unset IFS; return 1; }
|
||||
unset IFS
|
||||
|
||||
rm -f $TMP_FILE
|
||||
return $ret
|
||||
# Done: remove backups
|
||||
rm -rf ${IPSET_DATA_DIR_BACKUP}
|
||||
rm -rf ${IPSET_DATA_COMPAT_BACKUP}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
# Generate a grep regexp matching abbreviated command forms. E.g., for create:
|
||||
# \(c\|cr\|cre\|crea\|creat\|create\)
|
||||
cmd_short_expr() {
|
||||
out=
|
||||
cmd_len=1
|
||||
while [ "${cmd_len}" -le "${#1}" ]; do
|
||||
[ -z "${out}" ] && out='\(' || out="${out}"'\|'
|
||||
# shellcheck disable=SC2003 # No POSIX equivalent to expr substr
|
||||
out="${out}$(expr substr "${1}" 1 "${cmd_len}")"
|
||||
cmd_len=$((cmd_len + 1))
|
||||
done
|
||||
echo "${out}"'\)'
|
||||
}
|
||||
|
||||
ipset_restore() {
|
||||
file="${1}"
|
||||
|
||||
retfile="$(mktemp -q /tmp/ipset.XXXXXX)"
|
||||
CLEAN_FILES="${CLEAN_FILES} ${retfile}"
|
||||
|
||||
# If restore fails due to invalid lines, remove them and retry
|
||||
while ! restore_err="$( (${IPSET_BIN} -f "${file}" -! restore 2>&1; echo $? >"${retfile}") | head -n1; exit "$(cat "${retfile}")" )"; do
|
||||
warn "${restore_err}"
|
||||
case ${restore_err#*: } in
|
||||
"No command specified"*)
|
||||
line="$(grep -m1 -n "^${restore_err##* }" "${file}")"
|
||||
line="${line%:*}"
|
||||
;;
|
||||
"Missing second mandatory argument to command "*)
|
||||
cmd="${restore_err##* }"
|
||||
cmd_expr="$(cmd_short_expr "${cmd}")"
|
||||
line="$(grep -n '^'"${cmd_expr}" "${file}" | grep -m1 -v '^[0-9]\+\:'"${cmd_expr}"'[[:blank:]]\+[^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+')"
|
||||
line="${line%:*}"
|
||||
;;
|
||||
"Missing mandatory argument to command "*)
|
||||
cmd="${restore_err##* }"
|
||||
cmd_expr="$(cmd_short_expr "${cmd}")"
|
||||
line="$(grep -n '^'"${cmd_expr}" "${file}" | grep -m1 -v '^[0-9]\+\:'"${cmd_expr}"'[[:blank:]]\+[^[:blank:]]\+')"
|
||||
line="${line%:*}"
|
||||
;;
|
||||
"Command "*"is invalid in restore mode"*)
|
||||
restore_err_cmd="${restore_err#*: }"
|
||||
restore_err_cmd="${restore_err_cmd#*\`}"
|
||||
restore_err_cmd="${restore_err_cmd%%\'*}"
|
||||
cmd="${restore_err_cmd##* }"
|
||||
cmd_expr="$(cmd_short_expr "${cmd}")"
|
||||
line="$(grep -m1 -ne '^'"${cmd_expr}"'[[:blank:]]\+' -e '^'"${restore_err_cmd}"'$' "${file}")"
|
||||
line="${line%:*}"
|
||||
;;
|
||||
"Error in line "*)
|
||||
line="${restore_err%: *}"
|
||||
line="${line##* }"
|
||||
;;
|
||||
*)
|
||||
rm "${retfile}"
|
||||
CLEAN_FILES="${CLEAN_FILES%* ${retfile}}"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
[ -z "${line}" ] && return 1
|
||||
|
||||
warn "Skipped invalid entry: $(sed "${line}q;d" "${file}")"
|
||||
sed -i -e "${line}d" "${file}"
|
||||
|
||||
[ -s "${file}" ] || return 1
|
||||
done
|
||||
|
||||
rm "${retfile}"
|
||||
CLEAN_FILES="${CLEAN_FILES%* ${retfile}}"
|
||||
}
|
||||
|
||||
load() {
|
||||
if [ -f ${IPSET_DATA_SAVED_FLAG} ]; then
|
||||
# If we have a cleanly saved directory with all sets, we can
|
||||
# delete any left-overs and use it
|
||||
rm -rf ${IPSET_DATA_DIR_BACKUP}
|
||||
rm -f ${IPSET_DATA_COMPAT_BACKUP}
|
||||
else
|
||||
# If sets weren't cleanly saved, restore from backups
|
||||
[ -d ${IPSET_DATA_DIR_BACKUP} ] && rm -rf ${IPSET_DATA_DIR} && mv -Tf ${IPSET_DATA_DIR_BACKUP} ${IPSET_DATA_DIR}
|
||||
[ -f ${IPSET_DATA_COMPAT_BACKUP} ] && rm -f ${IPSET_DATA_COMPAT} && mv -Tf ${IPSET_DATA_COMPAT_BACKUP} ${IPSET_DATA_COMPAT}
|
||||
fi
|
||||
|
||||
if [ ! -d ${IPSET_DATA_DIR} ] && [ ! -f ${IPSET_DATA_COMPAT} ]; then
|
||||
info "No existing configuration available, none loaded"
|
||||
touch ${IPSET_RUN}
|
||||
return
|
||||
fi
|
||||
|
||||
# Merge all sets into temporary file
|
||||
merged="$(mktemp -q /tmp/ipset.XXXXXX)"
|
||||
CLEAN_FILES="${CLEAN_FILES} ${merged}"
|
||||
chmod 600 "${merged}"
|
||||
set +f
|
||||
if [ -d ${IPSET_DATA_DIR} ]; then
|
||||
# Copy create commands from each saved set first, then the rest:
|
||||
# list:set entries depend on other sets, so make sure they all
|
||||
# get created first
|
||||
for f in "${IPSET_DATA_DIR}"/*; do
|
||||
[ "${f}" = "${IPSET_DATA_DIR}/*" ] && break
|
||||
[ -f "${f}" ] || continue
|
||||
grep '^c' "${f}" >> "${merged}"
|
||||
done
|
||||
for f in "${IPSET_DATA_DIR}"/*; do
|
||||
[ "${f}" = "${IPSET_DATA_DIR}/*" ] && break
|
||||
[ -f "${f}" ] || continue
|
||||
grep -v '^c' "${f}" >> "${merged}"
|
||||
done
|
||||
fi
|
||||
set -f
|
||||
[ -f ${IPSET_DATA_COMPAT} ] && cat ${IPSET_DATA_COMPAT} >> "${merged}"
|
||||
|
||||
# Drop sets that aren't in saved data, mark conflicts with existing sets
|
||||
conflicts=""
|
||||
IFS="
|
||||
"
|
||||
for set in $(${IPSET_BIN} list -n -t); do
|
||||
grep -q "^create ${set} " "${merged}" && conflicts="${conflicts}|${set}" && continue
|
||||
|
||||
# We can't destroy the set if it's in use, flush it instead
|
||||
if ! ${IPSET_BIN} destroy "${set}" 2>/dev/null; then
|
||||
${IPSET_BIN} flush "${set}"
|
||||
fi
|
||||
done
|
||||
unset IFS
|
||||
conflicts="${conflicts#|*}"
|
||||
|
||||
# Common case: if we have no conflicts, just restore in one shot
|
||||
if [ -z "${conflicts}" ]; then
|
||||
if ! ipset_restore "${merged}"; then
|
||||
err "Failed to restore configured sets"
|
||||
exit 1
|
||||
fi
|
||||
rm "${merged}"
|
||||
CLEAN_FILES="${CLEAN_FILES%* ${merged}}"
|
||||
touch ${IPSET_RUN}
|
||||
return
|
||||
fi
|
||||
|
||||
# Find a salt for md5sum that makes names of saved sets unique
|
||||
salt=0
|
||||
while true; do
|
||||
unique=1
|
||||
IFS="
|
||||
"
|
||||
for set in $(${IPSET_BIN} list -n -t); do
|
||||
if grep -q "^create $(echo "${salt}${set}" | md5sum | head -c31) " "${merged}"; then
|
||||
unique=0
|
||||
break
|
||||
fi
|
||||
done
|
||||
unset IFS
|
||||
[ ${unique} -eq 1 ] && break
|
||||
salt=$((salt + 1))
|
||||
done
|
||||
|
||||
# Add sets, mangling names for conflicting sets
|
||||
mangled="$(mktemp -q /tmp/ipset.XXXXXX)"
|
||||
CLEAN_FILES="${CLEAN_FILES} ${mangled}"
|
||||
chmod 600 "${mangled}"
|
||||
|
||||
awk '/^(add|create) ('"${conflicts}"')/ { printf "%s ",$1; system("echo '${salt}'" $2 " | md5sum | head -c31"); $1=""; $2=""; print; next} {print}' "${merged}" > "${mangled}"
|
||||
if ! ipset_restore "${mangled}"; then
|
||||
err "Failed to restore configured sets"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
rm "${mangled}"
|
||||
CLEAN_FILES="${CLEAN_FILES%* ${mangled}}"
|
||||
|
||||
# Swap and delete old sets
|
||||
IFS='|'
|
||||
for set in ${conflicts}; do
|
||||
mangled="$(echo "${salt}${set}" | md5sum | head -c31)"
|
||||
if ! ${IPSET_BIN} swap "${set}" "${mangled}" 2>/dev/null; then
|
||||
# This fails if set types are different: try to destroy
|
||||
# existing set
|
||||
if ! ${IPSET_BIN} destroy "${set}" 2>/dev/null; then
|
||||
# Conflicting set is in use, we can only warn
|
||||
# and flush the existing set
|
||||
err "Cannot load set \"${set}\", set with same name and conflicting type in use"
|
||||
${IPSET_BIN} flush "${set}"
|
||||
${IPSET_BIN} destroy "${mangled}"
|
||||
else
|
||||
${IPSET_BIN} rename "${mangled}" "${set}"
|
||||
fi
|
||||
else
|
||||
${IPSET_BIN} destroy "${mangled}"
|
||||
fi
|
||||
done
|
||||
unset IFS
|
||||
|
||||
rm "${merged}"
|
||||
CLEAN_FILES="${CLEAN_FILES%* ${merged}}"
|
||||
touch ${IPSET_RUN}
|
||||
}
|
||||
|
||||
cleanup() {
|
||||
${IPSET_BIN} flush || err "Failed to flush sets"
|
||||
|
||||
# Try to destroy all sets at once. This will fail if some are in use,
|
||||
# destroy all the other ones in that case
|
||||
${IPSET_BIN} destroy 2>/dev/null && return
|
||||
IFS="
|
||||
"
|
||||
for set in $(${IPSET_BIN} list -n -t); do
|
||||
if ! ${IPSET_BIN} destroy "${set}"; then
|
||||
err "Failed to destroy set ${set}"
|
||||
fi
|
||||
done
|
||||
unset IFS
|
||||
}
|
||||
|
||||
stop() {
|
||||
[ -f ${IPSET_RUN} ] || { info "Not running"; return 0; }
|
||||
[ "${IPSET_SAVE_ON_STOP}" = "yes" ] && { save || err "Failed to save sets"; }
|
||||
|
||||
# Nothing to stop if the ip_set module is not loaded
|
||||
lsmod | grep -q "^ip_set " || { info "Not running"; rm ${IPSET_RUN}; return 0; }
|
||||
|
||||
# If the xt_set module is in use, then iptables is using ipset, so
|
||||
# refuse to stop the service
|
||||
if mod="$(lsmod | grep ^xt_set)"; then
|
||||
if [ "$(echo "${mod}" | tr -s ' ' | cut -d' ' -f3)" != "0" ]; then
|
||||
err "Current iptables configuration requires ipset" && return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
cleanup
|
||||
|
||||
rm ${IPSET_RUN}
|
||||
return 0
|
||||
}
|
||||
|
||||
lock
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
RETVAL=$?
|
||||
start)
|
||||
load
|
||||
;;
|
||||
stop)
|
||||
check_can_unload || exit 1
|
||||
[[ $IPSET_SAVE_ON_STOP = yes ]] && save
|
||||
stop)
|
||||
stop
|
||||
RETVAL=$?
|
||||
[[ $RETVAL -eq 6 ]] && echo "${IPSET}: not running" && exit 0
|
||||
;;
|
||||
reload)
|
||||
[[ $IPSET_SAVE_ON_RESTART = yes ]] && save
|
||||
stop
|
||||
RETVAL=$?
|
||||
[[ $RETVAL -eq 6 ]] && echo "${IPSET}: not running" && exit 0
|
||||
start
|
||||
RETVAL=$?
|
||||
reload)
|
||||
cleanup
|
||||
load
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $IPSET {start|stop|reload}" >&2
|
||||
save)
|
||||
save
|
||||
;;
|
||||
*)
|
||||
info "Usage: $0 {start|stop|reload|save}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
exit $?
|
||||
|
|
|
|||
158
SPECS/ipset.spec
158
SPECS/ipset.spec
|
|
@ -1,22 +1,20 @@
|
|||
# service legacy actions
|
||||
%define legacy_actions %{_libexecdir}/initscripts/legacy-actions
|
||||
|
||||
Name: ipset
|
||||
Version: 7.11
|
||||
Release: 5%{?dist}
|
||||
Version: 7.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Manage Linux IP sets
|
||||
|
||||
License: GPLv2
|
||||
URL: http://ipset.netfilter.org/
|
||||
Source0: %{url}/%{name}-%{version}.tar.bz2
|
||||
Source0: http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.service
|
||||
Source2: %{name}.start-stop
|
||||
|
||||
Patch1: 0001-Add-deprecation-notice-to-ipset.8.patch
|
||||
Source3: %{name}-config
|
||||
Source4: %{name}.save-legacy
|
||||
|
||||
BuildRequires: libmnl-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: make
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libtool-ltdl-devel
|
||||
|
||||
# An explicit requirement is needed here, to avoid cases where a user would
|
||||
# explicitly update only one of the two (e.g 'yum update ipset')
|
||||
|
|
@ -49,7 +47,6 @@ This package contains the libraries which provide the IP sets funcionality.
|
|||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}-libs%{?_isa} == %{version}-%{release}
|
||||
Requires: kernel-headers
|
||||
|
||||
%description devel
|
||||
This package contains the files required to develop software using the %{name}
|
||||
|
|
@ -72,11 +69,10 @@ out of the base package since it is not active by default.
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%configure --enable-static=no --with-kmod=no
|
||||
|
||||
# Just to make absolutely sure we are not building the bundled kernel module
|
||||
|
|
@ -87,11 +83,11 @@ rm -fr kernel
|
|||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
make install DESTDIR=%{buildroot}
|
||||
find %{buildroot} -name '*.la' -exec rm -f '{}' \;
|
||||
|
||||
# install systemd unit file
|
||||
|
|
@ -102,6 +98,14 @@ install -c -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}
|
|||
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
|
||||
install -c -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/%{name}
|
||||
|
||||
# install ipset-config
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -c -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-config
|
||||
|
||||
# install legacy actions for service command
|
||||
install -d %{buildroot}/%{legacy_actions}/ipset
|
||||
install -c -m 755 %{SOURCE4} %{buildroot}/%{legacy_actions}/ipset/save
|
||||
|
||||
# Create directory for configuration
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
|
||||
|
||||
|
|
@ -113,7 +117,9 @@ if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
|
|||
fi
|
||||
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
|
||||
%post service
|
||||
|
|
@ -129,89 +135,87 @@ fi
|
|||
%postun service
|
||||
%systemd_postun_with_restart %{name}.service
|
||||
|
||||
%triggerin service -- ipset-service < 6.38-1.el7
|
||||
# Before 6.38-1, ipset.start-stop keeps a backup of previously saved sets, but
|
||||
# doesn't touch the /etc/sysconfig/ipset.d/.saved flag. Remove the backup on
|
||||
# upgrade, so that we use the current version of saved sets
|
||||
rm -f /etc/sysconfig/ipset.save || :
|
||||
exit 0
|
||||
|
||||
%triggerun service -- ipset-service < 6.38-1.el7
|
||||
# Up to 6.29-1, ipset.start-stop uses a single data file
|
||||
for f in /etc/sysconfig/ipset.d/*; do
|
||||
[ "${f}" = "/etc/sysconfig/ipset.d/*" ] && break
|
||||
cat ${f} >> /etc/sysconfig/ipset || :
|
||||
done
|
||||
exit 0
|
||||
|
||||
%files
|
||||
%doc ChangeLog
|
||||
%license COPYING
|
||||
%{_mandir}/man8/%{name}.8.*
|
||||
%doc COPYING ChangeLog
|
||||
%doc %{_mandir}/man8/%{name}.8.gz
|
||||
%{_sbindir}/%{name}
|
||||
|
||||
%files libs
|
||||
%license COPYING
|
||||
%doc COPYING
|
||||
%{_libdir}/lib%{name}.so.13*
|
||||
%doc %{_mandir}/man3/lib%{name}.3.gz
|
||||
|
||||
%files devel
|
||||
%{_includedir}/lib%{name}
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_libdir}/pkgconfig/lib%{name}.pc
|
||||
%{_mandir}/man3/libipset.3.*
|
||||
|
||||
%files service
|
||||
%{_unitdir}/%{name}.service
|
||||
%dir %{_libexecdir}/%{name}
|
||||
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/ipset-config
|
||||
%ghost %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/ipset
|
||||
%attr(0755,root,root) %{_libexecdir}/%{name}/%{name}.start-stop
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{legacy_actions}/ipset
|
||||
%{legacy_actions}/ipset/save
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.11-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
* Sun May 26 2019 Stefano Brivio <sbrivio@redhat.com> - 7.1-1
|
||||
- Rebase to 7.1 (RHBZ#1649090):
|
||||
- Add compatibility support for strscpy()
|
||||
- Correct the manpage about the sort option
|
||||
- Add missing functions to libipset.map
|
||||
- configure.ac: Fix build regression on RHEL/CentOS/SL (Serhey Popovych)
|
||||
- Implement sorting for hash types in the ipset tool
|
||||
- Fix to list/save into file specified by option (reported by Isaac Good)
|
||||
- Introduction of new commands and protocol version 7, updated kernel include files
|
||||
- Add compatibility support for async in pernet_operations
|
||||
- Use more robust awk patterns to check for backward compatibility
|
||||
- Prepare the ipset tool to handle multiple protocol version
|
||||
- Fix warning message handlin
|
||||
- Correct to test null valued entry in hash:net6,port,net6 test
|
||||
- Library reworked to support embedding ipset completely
|
||||
- Add compatibility to support kvcalloc()
|
||||
- Validate string type attributes in attr2data() (Stefano Brivio)
|
||||
- manpage: Add comment about matching on destination MAC address (Stefano Brivio)
|
||||
(RHBZ#1649079)
|
||||
- Add compatibility to support is_zero_ether_addr()
|
||||
- Fix use-after-free in ipset_parse_name_compat() (Stefano Brivio) (RHBZ#1649085)
|
||||
- Fix leak in build_argv() on line parsing error (Stefano Brivio) (RHBZ#1649085)
|
||||
- Simplify return statement in ipset_mnl_query() (Stefano Brivio) (RHBZ#1649085)
|
||||
- tests/check_klog.sh: Try dmesg too, don't let shell terminate script (Stefano Brivio)
|
||||
- Fixes:
|
||||
- Fix all shellcheck warnings in init script (RHBZ#1649085)
|
||||
- Make error reporting consistent, introduce different severities (RHBZ#1683711)
|
||||
- While restoring, on invalid entries, remove them and retry (RHBZ#1683713)
|
||||
- Fix covscan SC2166 warning in init script (RHBZ#1649085)
|
||||
|
||||
* Fri Jul 02 2021 Phil Sutter <psutter@redhat.com> - 7.11-4
|
||||
- Improve deprecation notice a bit
|
||||
* Tue Nov 13 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-3
|
||||
- Fix loading of sets with dependencies on other sets (RHBZ#1647096), and
|
||||
hardcode 6.38-1.el7 for ipset-service upgrade and downgrade triggers, so that
|
||||
we don't run into issues with z-stream updates
|
||||
|
||||
* Fri Jun 25 2021 Phil Sutter <psutter@redhat.com> - 7.11-3
|
||||
- Add deprecation notice to ipset.8
|
||||
* Mon Oct 08 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-2
|
||||
- Drop ipset-devel dependency on kernel-devel (RHBZ#163175)
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.11-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Mar 01 2021 Nicolas Chauvet <kwizart@gmail.com> - 7.11-1
|
||||
- Update to 7.11
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 21 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.10-1
|
||||
- Update to 7.10
|
||||
|
||||
* Wed Dec 16 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.9-1
|
||||
- Update to 7.9
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Feb 24 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.6-1
|
||||
- Update to 7.6
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jan 10 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.5-1
|
||||
- Update to 7.5
|
||||
|
||||
* Mon Nov 04 2019 Eric Garver <eric@garver.life> - 7.4-1
|
||||
- Update to 7.4
|
||||
|
||||
* Mon Aug 19 2019 Nicolas Chauvet <kwizart@gmail.com> - 7.3-1
|
||||
- Update to 7.3
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2019 Nicolas Chauvet <kwizart@gmail.com> - 7.2-1
|
||||
- Update to 7.2
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.38-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Aug 13 2018 Nicolas Chauvet <kwizart@gmail.com> - 6.38-1
|
||||
- Update to 6.38
|
||||
- Clean-up spec
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.35-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
* Tue Aug 14 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-1
|
||||
- Update to 6.38, source from RHEL7 6.38-2 (RHBZ#1615967)
|
||||
|
||||
* Mon Feb 12 2018 Eric Garver <egarver@redhat.com> - 6.35-3
|
||||
- Patch for missing header file (RHBZ#1543596)
|
||||
|
|
|
|||
Loading…
Reference in New Issue