diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in index 51767d1ae..63eeeb87e 100644 --- a/debian/dkms.conf.in +++ b/debian/dkms.conf.in @@ -3,5 +3,5 @@ PACKAGE_VERSION="__VERSION__" MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build" CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean" AUTOINSTALL=yes -BUILT_MODULE_NAME[0]="ipt_MEDIAPROXY" +BUILT_MODULE_NAME[0]="xt_MEDIAPROXY" DEST_MODULE_LOCATION[0]=/extra diff --git a/debian/ngcp-mediaproxy-ng-daemon.init b/debian/ngcp-mediaproxy-ng-daemon.init index 2fee41624..05583ed3e 100755 --- a/debian/ngcp-mediaproxy-ng-daemon.init +++ b/debian/ngcp-mediaproxy-ng-daemon.init @@ -64,7 +64,7 @@ case "$1" in start) echo -n "Starting $DESC: $NAME" - modprobe ipt_MEDIAPROXY + modprobe xt_MEDIAPROXY set +e echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null iptables -D INPUT -j MEDIAPROXY --id $TABLE 2>/dev/null @@ -86,7 +86,7 @@ case "$1" in echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null iptables -D INPUT -j MEDIAPROXY --id $TABLE 2>/dev/null iptables -D INPUT -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null - rmmod ipt_MEDIAPROXY 2>/dev/null + rmmod xt_MEDIAPROXY 2>/dev/null set -e rm -f $PIDFILE log_end_msg $? @@ -107,9 +107,9 @@ case "$1" in fi iptables -D INPUT -j MEDIAPROXY --id $TABLE 2>/dev/null iptables -D INPUT -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null - rmmod ipt_MEDIAPROXY 2>/dev/null + rmmod xt_MEDIAPROXY 2>/dev/null set -e - modprobe ipt_MEDIAPROXY + modprobe xt_MEDIAPROXY iptables -I INPUT -p udp -j MEDIAPROXY --id $TABLE start-stop-daemon --start --quiet --pidfile \ $PIDFILE --exec $DAEMON -- $OPTIONS diff --git a/debian/ngcp-mediaproxy-ng-iptables.install b/debian/ngcp-mediaproxy-ng-iptables.install index d5b5d025a..e91fc8026 100644 --- a/debian/ngcp-mediaproxy-ng-iptables.install +++ b/debian/ngcp-mediaproxy-ng-iptables.install @@ -1 +1 @@ -iptables-extension/libipt_MEDIAPROXY.so /lib/xtables/ +iptables-extension/libxt_MEDIAPROXY.so /lib/xtables/ diff --git a/debian/rules b/debian/rules index 10a38b203..05cd1648f 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ build: build-stamp build-stamp: dh_testdir - cd iptables-extension/ && gcc -O2 -Wall -fPIC -shared -o libipt_MEDIAPROXY.so libipt_MEDIAPROXY-1.4.c && cd .. + cd iptables-extension/ && gcc -O2 -Wall -fPIC -shared -o libxt_MEDIAPROXY.so libxt_MEDIAPROXY-1.4.c && cd .. cd daemon && $(MAKE) && cd .. touch $@ @@ -45,8 +45,8 @@ clean: dh_testroot cd daemon && $(MAKE) clean && cd .. rm -f build-stamp - rm -f iptables-extension/libipt_MEDIAPROXY.so - rm -f daemon/mediaproxy-ng daemon/build_time.h daemon/.depend kernel-module/.ipt_MEDIAPROXY.o.d + rm -f iptables-extension/libxt_MEDIAPROXY.so + rm -f daemon/mediaproxy-ng daemon/build_time.h daemon/.depend kernel-module/.xt_MEDIAPROXY.o.d rm -rf kernel-module/.tmp_versions dh_clean -rm -rf debian/build diff --git a/debian/rules.modules b/debian/rules.modules index ce5fad033..e6edfd923 100644 --- a/debian/rules.modules +++ b/debian/rules.modules @@ -62,7 +62,7 @@ binary-modules: prep-deb-files $(MAKE) modules KSRC=$(KSRC) KVER=$(KVERS) # Install the module - install -D -m 0644 ipt_MEDIAPROXY.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/extra/ipt_MEDIAPROXY.ko + install -D -m 0644 xt_MEDIAPROXY.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/extra/xt_MEDIAPROXY.ko dh_installdocs dh_installchangelogs