From e51368f580164e7324c706501758aaf56a4fa312 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 9 Aug 2019 00:03:23 +0200 Subject: [PATCH] Update for PHP 7. --- php5-itkacl-2.0/debian/changelog | 5 ----- php5-itkacl-2.0/debian/php5-itkacl.dirs | 1 - {php5-itkacl-2.0 => php7-itkacl-2.0}/Makefile | 4 ++-- php7-itkacl-2.0/debian/changelog | 11 +++++++++++ {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/compat | 0 {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/control | 6 +++--- .../debian/itkacl.ini | 0 php7-itkacl-2.0/debian/php7-itkacl.dirs | 1 + {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/rules | 6 +++--- {php5-itkacl-2.0 => php7-itkacl-2.0}/itkacl.i | 11 ++++++++--- 10 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 php5-itkacl-2.0/debian/changelog delete mode 100644 php5-itkacl-2.0/debian/php5-itkacl.dirs rename {php5-itkacl-2.0 => php7-itkacl-2.0}/Makefile (86%) create mode 100644 php7-itkacl-2.0/debian/changelog rename {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/compat (100%) rename {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/control (72%) rename {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/itkacl.ini (100%) create mode 100644 php7-itkacl-2.0/debian/php7-itkacl.dirs rename {php5-itkacl-2.0 => php7-itkacl-2.0}/debian/rules (73%) rename {php5-itkacl-2.0 => php7-itkacl-2.0}/itkacl.i (81%) diff --git a/php5-itkacl-2.0/debian/changelog b/php5-itkacl-2.0/debian/changelog deleted file mode 100644 index 9f4f4b3..0000000 --- a/php5-itkacl-2.0/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -php5-itkacl (2.0) unstable; urgency=low - - * Initial release. - - -- Steinar H. Gunderson Tue, 14 May 2013 19:02:22 +0200 diff --git a/php5-itkacl-2.0/debian/php5-itkacl.dirs b/php5-itkacl-2.0/debian/php5-itkacl.dirs deleted file mode 100644 index 8ca3a0f..0000000 --- a/php5-itkacl-2.0/debian/php5-itkacl.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/php5/conf.d diff --git a/php5-itkacl-2.0/Makefile b/php7-itkacl-2.0/Makefile similarity index 86% rename from php5-itkacl-2.0/Makefile rename to php7-itkacl-2.0/Makefile index 74968dc..e282a1e 100644 --- a/php5-itkacl-2.0/Makefile +++ b/php7-itkacl-2.0/Makefile @@ -8,8 +8,8 @@ php_itkacl.so: itkacl_wrap.o itkacl_wrap.o: itkacl_wrap.cpp $(CXX) $(shell php-config --includes) $(CXXFLAGS) -c itkacl_wrap.cpp -o itkacl_wrap.o -itkacl_wrap.cpp: - swig -php5 -c++ itkacl.i +itkacl_wrap.cpp: itkacl.i + swig -php7 -noproxy -c++ -cppext cpp itkacl.i clean: $(RM) itkacl.php itkacl_wrap.cpp itkacl_wrap.o php_itkacl.h php_itkacl.so diff --git a/php7-itkacl-2.0/debian/changelog b/php7-itkacl-2.0/debian/changelog new file mode 100644 index 0000000..4dbb7c2 --- /dev/null +++ b/php7-itkacl-2.0/debian/changelog @@ -0,0 +1,11 @@ +php7-itkacl (2.1) unstable; urgency=medium + + * Port to PHP 7. + + -- Steinar H. Gunderson Fri, 09 Aug 2019 00:05:36 +0200 + +php5-itkacl (2.0) unstable; urgency=low + + * Initial release. + + -- Steinar H. Gunderson Tue, 14 May 2013 19:02:22 +0200 diff --git a/php5-itkacl-2.0/debian/compat b/php7-itkacl-2.0/debian/compat similarity index 100% rename from php5-itkacl-2.0/debian/compat rename to php7-itkacl-2.0/debian/compat diff --git a/php5-itkacl-2.0/debian/control b/php7-itkacl-2.0/debian/control similarity index 72% rename from php5-itkacl-2.0/debian/control rename to php7-itkacl-2.0/debian/control index 288ecb1..b7ce5e8 100644 --- a/php5-itkacl-2.0/debian/control +++ b/php7-itkacl-2.0/debian/control @@ -1,11 +1,11 @@ -Source: php5-itkacl +Source: php7-itkacl Priority: extra Maintainer: Steinar H. Gunderson -Build-Depends: debhelper (>= 7.0.50~), libitkacl-dev, php5-dev +Build-Depends: debhelper (>= 7.0.50~), libitkacl-dev, php7.3-dev Standards-Version: 3.9.1 Section: php -Package: php5-itkacl +Package: php7-itkacl Section: php Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends} diff --git a/php5-itkacl-2.0/debian/itkacl.ini b/php7-itkacl-2.0/debian/itkacl.ini similarity index 100% rename from php5-itkacl-2.0/debian/itkacl.ini rename to php7-itkacl-2.0/debian/itkacl.ini diff --git a/php7-itkacl-2.0/debian/php7-itkacl.dirs b/php7-itkacl-2.0/debian/php7-itkacl.dirs new file mode 100644 index 0000000..db7d8a6 --- /dev/null +++ b/php7-itkacl-2.0/debian/php7-itkacl.dirs @@ -0,0 +1 @@ +etc/php7/conf.d diff --git a/php5-itkacl-2.0/debian/rules b/php7-itkacl-2.0/debian/rules similarity index 73% rename from php5-itkacl-2.0/debian/rules rename to php7-itkacl-2.0/debian/rules index f177e9e..8404452 100755 --- a/php5-itkacl-2.0/debian/rules +++ b/php7-itkacl-2.0/debian/rules @@ -16,8 +16,8 @@ binary-arch: dh_testroot dh_prep dh_installdirs - $(MAKE) install DESTDIR=debian/php5-itkacl - install -m 0644 -o root -g root debian/itkacl.ini debian/php5-itkacl/etc/php5/conf.d/ + $(MAKE) install DESTDIR=debian/php7-itkacl + install -m 0644 -o root -g root debian/itkacl.ini debian/php7-itkacl/etc/php7/conf.d/ dh_installdocs dh_installchangelogs dh_compress @@ -25,7 +25,7 @@ binary-arch: dh_strip dh_makeshlibs dh_shlibdeps - echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php5-itkacl.substvars + echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php7-itkacl.substvars dh_installdeb dh_gencontrol dh_md5sums diff --git a/php5-itkacl-2.0/itkacl.i b/php7-itkacl-2.0/itkacl.i similarity index 81% rename from php5-itkacl-2.0/itkacl.i rename to php7-itkacl-2.0/itkacl.i index 18ae21c..06eef1e 100644 --- a/php5-itkacl-2.0/itkacl.i +++ b/php7-itkacl-2.0/itkacl.i @@ -10,9 +10,6 @@ * restrictions. */ %inline %{ - /* This is due to Swig forgetting one file */ - #include - extern "C" int itkacl_check(char *realm, char *user, char *errmsg, size_t errmsgsize); class itkaclwrap { @@ -26,9 +23,17 @@ int ret = itkacl_check(realm, user, itkacl_errmsg, 1024); if (ret == -1) { SWIG_exception(SWIG_RuntimeError,itkacl_errmsg); +thrown: return -1; } else { return ret == 0; } } %} +%pragma(php) code=" +class itkacl { + static function check($realm,$user) { + return itkaclwrap_check($realm,$user); + } +} " + -- 2.39.2