diff -Nru rapache-1.2.7/debian/changelog rapache-1.2.8/debian/changelog --- rapache-1.2.7/debian/changelog 2015-08-06 09:58:00.000000000 +0000 +++ rapache-1.2.8/debian/changelog 2016-05-05 09:24:08.000000000 +0000 @@ -1,3 +1,11 @@ +rapache (1.2.8-1) unstable; urgency=medium + + * Add libicu-dev to Build-Depends (Closes: #823045) + * Add d/watch to monitor upstream github + * Imported Upstream version 1.2.8 + + -- Ondřej Surý Thu, 05 May 2016 11:23:00 +0200 + rapache (1.2.7-1) unstable; urgency=low * Initial packaging (Closes: #794747) diff -Nru rapache-1.2.7/debian/control rapache-1.2.8/debian/control --- rapache-1.2.7/debian/control 2015-08-06 09:58:00.000000000 +0000 +++ rapache-1.2.8/debian/control 2016-05-05 09:24:08.000000000 +0000 @@ -2,15 +2,23 @@ Section: web Priority: optional Maintainer: Ondřej Surý -Build-Depends: debhelper (>= 9), dh-apache2, apache2-dev, r-base-core, r-base-dev, libapreq2-dev, dh-autoreconf, autotools-dev +Build-Depends: apache2-dev, + autotools-dev, + debhelper (>= 9), + dh-apache2, + dh-autoreconf, + libapreq2-dev, + libicu-dev, + r-base-core, + r-base-dev Standards-Version: 3.9.6 Homepage: http://www.rapache.net/ Package: libapache2-mod-r-base Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, - r-base-core +Depends: r-base-core, + ${misc:Depends}, + ${shlibs:Depends} Description: server-side R integration with Apache 2 This package provides the R module that adds support for embedding the R interpreter inside Apache 2 webserver. diff -Nru rapache-1.2.7/debian/gbp.conf rapache-1.2.8/debian/gbp.conf --- rapache-1.2.7/debian/gbp.conf 2015-08-06 09:58:00.000000000 +0000 +++ rapache-1.2.8/debian/gbp.conf 2016-05-05 09:24:08.000000000 +0000 @@ -2,7 +2,7 @@ debian-branch = master debian-tag = debian/%(version)s upstream-branch = upstream -upstream-tag = %(version)s +upstream-tag = upstream/%(version)s [dch] meta = 1 diff -Nru rapache-1.2.7/debian/watch rapache-1.2.8/debian/watch --- rapache-1.2.7/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ rapache-1.2.8/debian/watch 2016-05-05 09:24:08.000000000 +0000 @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/rapache-$1\.tar\.gz/ \ + https://github.com/jeffreyhorner/rapache/tags .*/v?(\d\S*)\.tar\.gz diff -Nru rapache-1.2.7/mod_R.c rapache-1.2.8/mod_R.c --- rapache-1.2.7/mod_R.c 2015-06-24 16:40:55.000000000 +0000 +++ rapache-1.2.8/mod_R.c 2016-04-23 19:17:32.000000000 +0000 @@ -19,7 +19,7 @@ * Headers and macros * *************************************************************************/ -#define MOD_R_VERSION "1.2.7" +#define MOD_R_VERSION "1.2.8" #include "mod_R.h" #include diff -Nru rapache-1.2.7/README rapache-1.2.8/README --- rapache-1.2.7/README 2015-06-24 16:40:55.000000000 +0000 +++ rapache-1.2.8/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ - - The Rapache Project - - What is it? - ----------- - Rapache is a project dedicated to embedding the R interpreter inside - the Apache 2.0 (and beyond) web server. It's composed of two parts: - - mod_R: the Apache 2.0 module that implements the glue to load the - R interpreter. - - libapreq 2.0.4: an Apache sponsored project for parsing request input. - If you don't want to compile and install this version, then you can - specify which libapreq2 library to use during configuration. - - The Latest Version - ------------------ - - Details of the latest version can be found at the R/Apache - project page: - - http://biostat.mc.vanderbilt.edu/rapache/ - - Prerequisites - ------------- - This release has been tested under Debian Linux with Apache 2.2.4, - R 2.5.1, and libapreq 2.0.4. Apache2 _MUST_ be compiled with the - prefork MPM to compile mod_R. Also, R must have been compiled with - the --enable-R-shlib configure flag. - - Installation - ------------ - The following is the preferred way to compile and install rapache: - - $ ./configure - $ make - $ make install - - configure will try to find the needed programs to compile rapache, - but if it fails to locate them or if you have installed the - prerequisites in non-standard places, then you can specify their - locations with the following flags: - - --with-apache2-apxs=/path/to/apxs - --with-R=/path/to/R - --with-apreq2-config=/path/to/apreq2-config - - Configuration - ------------- - Add something similar to this to the apache config file: - - LoadModule R_module /path/to/mod_R.so - - # Output R errors and warnings to the browser - ROutputErrors - - # Displays information about rapache and R - - SetHandler r-info - - - # Process all files under /path/to/brew/scripts with - # package brew and function brew - - SetHandler r-script - RHandler brew::brew - - - # This url will run the file /path/to/r/script.R - - SetHandler r-handler - RFileHandler /path/to/r/script.R - - - Also, libR.so _MUST_ be found in the shared library path as it is - linked to by mod_R, RApache and the rest of the packages containing - shared libraries. You can either set LD_LIBRARY_PATH like this: - - $ export LD_LIBRARY_PATH=`/path/to/R RHOME`/lib - - or add that path to /etc/ld.so.conf and then run ldconfig. - - NOTE: the latest apache2 debian packages cause the web server to run - in a very reduced environment, thus one is unable to set LD_LIBRARY_PATH - before calling /etc/init.d/apache2. One option is to actually edit that - file and add the LD_LIBRARY_PATH explicitly. Another is to use the apache2ctl - scripts which are also bundled with the debian packages. Or you can add it - to /etc/ld.so.conf. - - Documentation - ------------- - - Forthcoming. See http://biostat.mc.vanderbilt.edu/rapache/manual.html - for ongoing updates. - - Licensing - --------- - - The R/Apache source code is licensed under the Apache License Version - 2.0. Please see the file called LICENSE. - diff -Nru rapache-1.2.7/README.md rapache-1.2.8/README.md --- rapache-1.2.7/README.md 1970-01-01 00:00:00.000000000 +0000 +++ rapache-1.2.8/README.md 2016-04-23 19:17:32.000000000 +0000 @@ -0,0 +1,101 @@ + + The Rapache Project + + What is it? + ----------- + Rapache is a project dedicated to embedding the R interpreter inside + the Apache 2.0 (and beyond) web server. It's composed of two parts: + + mod_R: the Apache 2.0 module that implements the glue to load the + R interpreter. + + libapreq 2.0.4: an Apache sponsored project for parsing request input. + If you don't want to compile and install this version, then you can + specify which libapreq2 library to use during configuration. + + The Latest Version + ------------------ + + Details of the latest version can be found at the R/Apache + project page: + + http://rapache.net/ + + Prerequisites + ------------- + This release has been tested under Debian Linux with Apache 2.2.4, + R 2.5.1, and libapreq 2.0.4. Apache2 _MUST_ be compiled with the + prefork MPM to compile mod_R. Also, R must have been compiled with + the --enable-R-shlib configure flag. + + Installation + ------------ + The following is the preferred way to compile and install rapache: + + $ ./configure + $ make + $ make install + + configure will try to find the needed programs to compile rapache, + but if it fails to locate them or if you have installed the + prerequisites in non-standard places, then you can specify their + locations with the following flags: + + --with-apache2-apxs=/path/to/apxs + --with-R=/path/to/R + --with-apreq2-config=/path/to/apreq2-config + + Configuration + ------------- + Add something similar to this to the apache config file: + + LoadModule R_module /path/to/mod_R.so + + # Output R errors and warnings to the browser + ROutputErrors + + # Displays information about rapache and R + + SetHandler r-info + + + # Process all files under /path/to/brew/scripts with + # package brew and function brew + + SetHandler r-script + RHandler brew::brew + + + # This url will run the file /path/to/r/script.R + + SetHandler r-handler + RFileHandler /path/to/r/script.R + + + Also, libR.so _MUST_ be found in the shared library path as it is + linked to by mod_R, RApache and the rest of the packages containing + shared libraries. You can either set LD_LIBRARY_PATH like this: + + $ export LD_LIBRARY_PATH=`/path/to/R RHOME`/lib + + or add that path to /etc/ld.so.conf and then run ldconfig. + + NOTE: the latest apache2 debian packages cause the web server to run + in a very reduced environment, thus one is unable to set LD_LIBRARY_PATH + before calling /etc/init.d/apache2. One option is to actually edit that + file and add the LD_LIBRARY_PATH explicitly. Another is to use the apache2ctl + scripts which are also bundled with the debian packages. Or you can add it + to /etc/ld.so.conf. + + Documentation + ------------- + + Forthcoming. See http://rapache.net/manual.html + for ongoing updates. + + Licensing + --------- + + The R/Apache source code is licensed under the Apache License Version + 2.0. Please see the file called LICENSE. + diff -Nru rapache-1.2.7/rpm/rapache-openSUSE_13.1.spec rapache-1.2.8/rpm/rapache-openSUSE_13.1.spec --- rapache-1.2.7/rpm/rapache-openSUSE_13.1.spec 2015-06-24 16:40:55.000000000 +0000 +++ rapache-1.2.8/rpm/rapache-openSUSE_13.1.spec 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -Name: rapache -Version: 1.2.6 -Release: rpm0 -Source: %{name}-%{version}.tar.gz -License: Apache2 -Summary: RApache module for apache2 web server (mod_R) -Group: Applications/Internet -Buildroot: %{_tmppath}/%{name}-buildroot -URL: http://www.rapache.net -BuildRequires: apache2-devel -BuildRequires: R-base-devel -BuildRequires: libicu-devel -BuildRequires: make -Requires: libicu -Requires: apache2 -Requires: apache2-prefork -Requires: R-base - -%description -First presented at DSC2005, rApache is a project supporting web application development using the R statistical language and environment and the Apache web server. The current release runs on UNIX/Linux and Mac OS X operating systems. - -%prep -%setup - -%build -./configure -make - -%install -mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache2/ -sed -i.bak s\,modules/mod_R.so,%{_libdir}/apache2/mod_R.so,g ./rpm/00-rapache.conf -sed -i.bak s\,/var/www/html,/srv/www/htdocs,g ./rpm/00-rapache.conf -cp .libs/mod_R.so $RPM_BUILD_ROOT%{_libdir}/apache2/ -cp libapreq2/library/.libs/libapreq2.so.3 $RPM_BUILD_ROOT%{_libdir}/ -mkdir -p %{buildroot}/etc/apache2/conf.d -cp ./rpm/00-rapache.conf %{buildroot}/etc/apache2/conf.d/ -mkdir -p %{buildroot}/srv/www/htdocs/R -cp ./rpm/test %{buildroot}/srv/www/htdocs/R/ -export NO_BRP_CHECK_RPATH=true - -%pre - -%post -systemctl restart apache2.service || true - -%preun - -%postun -systemctl restart apache2.service || true - -%files -%defattr(644,wwwrun,www,755) -/etc/apache2/conf.d/00-rapache.conf -%{_libdir}/apache2/mod_R.so -%{_libdir}/libapreq2.so.3 -%dir /srv/www/htdocs/R -/srv/www/htdocs/R/test diff -Nru rapache-1.2.7/rpm/rapache-openSUSE_13.2.spec rapache-1.2.8/rpm/rapache-openSUSE_13.2.spec --- rapache-1.2.7/rpm/rapache-openSUSE_13.2.spec 1970-01-01 00:00:00.000000000 +0000 +++ rapache-1.2.8/rpm/rapache-openSUSE_13.2.spec 2016-04-23 19:17:32.000000000 +0000 @@ -0,0 +1,57 @@ +Name: rapache +Version: 1.2.7 +Release: rpm0 +Source: %{name}-%{version}.tar.gz +License: Apache2 +Summary: RApache module for apache2 web server (mod_R) +Group: Applications/Internet +Buildroot: %{_tmppath}/%{name}-buildroot +URL: http://www.rapache.net +BuildRequires: apache2-devel +BuildRequires: R-base-devel +BuildRequires: libicu-devel +BuildRequires: make +Requires: libicu +Requires: apache2 +Requires: apache2-prefork +Requires: R-base + +%description +First presented at DSC2005, rApache is a project supporting web application development using the R statistical language and environment and the Apache web server. The current release runs on UNIX/Linux and Mac OS X operating systems. + +%prep +%setup + +%build +./configure +make + +%install +mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache2/ +sed -i.bak s\,modules/mod_R.so,%{_libdir}/apache2/mod_R.so,g ./rpm/00-rapache.conf +sed -i.bak s\,/var/www/html,/srv/www/htdocs,g ./rpm/00-rapache.conf +cp .libs/mod_R.so $RPM_BUILD_ROOT%{_libdir}/apache2/ +cp libapreq2/library/.libs/libapreq2.so.3 $RPM_BUILD_ROOT%{_libdir}/ +mkdir -p %{buildroot}/etc/apache2/conf.d +cp ./rpm/00-rapache.conf %{buildroot}/etc/apache2/conf.d/ +mkdir -p %{buildroot}/srv/www/htdocs/R +cp ./rpm/test %{buildroot}/srv/www/htdocs/R/ +export NO_BRP_CHECK_RPATH=true + +%pre + +%post +systemctl restart apache2.service || true + +%preun + +%postun +systemctl restart apache2.service || true + +%files +%defattr(644,wwwrun,www,755) +/etc/apache2/conf.d/00-rapache.conf +%{_libdir}/apache2/mod_R.so +%{_libdir}/libapreq2.so.3 +%dir /srv/www/htdocs/R +/srv/www/htdocs/R/test