Browse Source

updated 7 packages

lmdb-0.9.24-1

libmodsecurity-3.0.3-3

libssh2-1.9.0-1

nginx-1.16.1-2

proftpd-1.3.6b-1

ssdeep-2.14.1-8

yajl-2.1.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12284 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
cc8af0df53

+ 211 - 0
l/lmdb/lmdb-vl.spec

@@ -0,0 +1,211 @@
+# The files themselves are in several subdirectories and need to be prefixed wit this.
+%global archive_path libraries/lib%{name}
+
+Name:           lmdb
+Version:        0.9.24
+Release:        1%{?_dist_release}
+Summary:        Memory-mapped key-value database
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        OpenLDAP
+URL:            http://symas.com/mdb/
+Source0:        https://github.com/LMDB/lmdb/archive/LMDB_%{version}.tar.gz
+Source1:        lmdb.pc.in
+# Patch description in the corresponding file
+Patch0: lmdb-make.patch
+Patch1: lmdb-s390-check.patch
+
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: doxygen
+
+%description
+LMDB is an ultra-fast, ultra-compact key-value embedded data
+store developed by Symas for the OpenLDAP Project. By using memory-mapped files,
+it provides the read performance of a pure in-memory database while still
+offering the persistence of standard disk-based databases, and is only limited
+to the size of the virtual address space.
+
+%package        libs
+Summary:        Shared libraries for %{name}
+
+%description    libs
+The %{name}-libs package contains shared libraries necessary for running
+applications that use %{name}.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package        doc
+Summary:        Documentation files for %{name}
+BuildArch:      noarch
+
+%description    doc
+The %{name}-doc package contains automatically generated documentation for %{name}.
+
+
+%prep
+%setup -q -n %{name}-LMDB_%{version}
+%patch0 -p1 -b .make
+%patch1 -p1 -b .s390-check
+
+
+%build
+pushd %{archive_path}
+make XCFLAGS="%{optflags}" %{?_smp_mflags}
+# Build doxygen documentation
+doxygen
+# remove unpackaged files
+rm -f Doxyfile
+rm -rf man # Doxygen generated manpages
+popd
+
+%install
+pushd %{archive_path}
+# make install expects existing directory tree
+mkdir -m 0755 -p %{buildroot}{%{_bindir},%{_includedir}}
+mkdir -m 0755 -p %{buildroot}{%{_libdir}/pkgconfig,%{_mandir}/man1}
+make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} mandir=%{_mandir} install
+popd
+
+# Install pkgconfig file
+sed -e 's:@PREFIX@:%{_prefix}:g' \
+    -e 's:@EXEC_PREFIX@:%{_exec_prefix}:g' \
+    -e 's:@LIBDIR@:%{_libdir}:g' \
+    -e 's:@INCLUDEDIR@:%{_includedir}:g' \
+    -e 's:@PACKAGE_VERSION@:%{version}:g' \
+    %{SOURCE1} >lmdb.pc
+install -Dpm 0644 -t %{buildroot}%{_libdir}/pkgconfig lmdb.pc
+
+%check
+pushd %{archive_path}
+rm -rf testdb
+LD_LIBRARY_PATH=$PWD make test
+popd
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%{_bindir}/*
+%{_mandir}/man1/*
+
+%files libs
+%doc %{archive_path}/COPYRIGHT
+%doc %{archive_path}/CHANGES
+%license %{archive_path}/LICENSE
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+%files doc
+%doc %{archive_path}/html
+%doc %{archive_path}/COPYRIGHT
+%doc %{archive_path}/CHANGES
+%license %{archive_path}/LICENSE
+
+
+%changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.9.24-1
+- initial build for Vine Linux.
+- new upstream release.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 09 2019 Tomas Krizek <tomas.krizek@nic.cz> - 0.9.23-1
+- Updated to 0.9.23
+
+* Mon Nov 05 2018 Jan Staněk <jstanek@redhat.com> - 0.9.22-4
+- Import upstream fix for rhbz#1645114
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Apr 23 2018 Florin Asavoaie <florin.asavoaie@gmail.com> - 0.9.22-2
+- Fixed Build Dependencies
+- Made build work on CentOS 7 for EPEL
+
+* Tue Apr 10 2018 Jan Staněk <jstanek@redhat.com> - 0.9.22-1
+- Updated to 0.9.22
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.21-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jun 02 2017 Jan Stanek <jstanek@redhat.com> - 0.9.21-1
+- Update to 0.9.21
+
+* Mon Mar 20 2017 Jan Stanek <jstanek@redhat.com> - 0.9.20-3
+- Add pkgconfig file to devel subpackage
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 12 2017 Jan Stanek <jstanek@redhat.com> - 0.9.20-1
+- Update to 0.9.20
+
+* Wed Jan 04 2017 Jan Stanek <jstanek@redhat.com> - 0.9.19-1
+- Update to 0.9.19
+
+* Wed Feb 10 2016 Jan Stanek <jstanek@redhat.com> - 0.9.18-1
+- Update to 0.9.18
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Dec 28 2015 Jan Vcelak <jvcelak@fedoraproject.org> 0.9.17-2
+- Make liblmdb.so a symbolic link to (not a copy of) the versioned DSO
+
+* Thu Dec 03 2015 Jan Staněk <jstanek@redhat.com> - 0.9.17-1
+- Update to 0.9.17
+
+* Wed Nov 25 2015 Jan Staněk <jstanek@redhat.com> - 0.9.16-2
+- Return the name 'Symas' into description
+
+* Fri Aug 14 2015 Jan Staněk <jstanek@redhat.com> - 0.9.16-1
+- Updated to 0.9.16
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Dec 11 2014 Jan Staněk <jstanek@redhat.com> - 0.9.14-1
+- Updated to 0.9.14
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jul 18 2014 Jan Stanek <jstanek@redhat.com> - 0.9.13-1
+- Updated to 0.9.13
+
+* Mon Jul 14 2014 Jan Stanek <jstanek@redhat.com> - 0.9.11-4
+- Changed install instruction to be compatible with older coreutils (#1119084)
+
+* Thu Jun 26 2014 Jan Stanek <jstanek@redhat.com> - 0.9.11-3
+- Added delay in testing which was needed on s390* arches (#1104232)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 27 2014 Jan Stanek <jstanek@redhat.com> - 0.9.11-1
+- Initial Package

+ 142 - 0
lib/libm/libmodsecurity/libmodsecurity-vl.spec

@@ -0,0 +1,142 @@
+
+Name:           libmodsecurity
+Version:        3.0.3
+Release:        3%{?_dist_release}
+Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        ASL 2.0
+URL:            https://www.modsecurity.org/
+
+Source0:        https://github.com/SpiderLabs/ModSecurity/releases/download/v%{version}/modsecurity-v%{version}.tar.gz
+
+BuildRequires: gcc-c++
+BuildRequires: make
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: git-core
+BuildRequires: ssdeep-devel
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(yajl)
+BuildRequires: curl-devel
+BuildRequires: pkgconfig(geoip)
+BuildRequires: pkgconfig(libpcre)
+BuildRequires: pkgconfig(lmdb)
+
+# libinjection is supposed to be bundled (same as with mod_security 2.x)
+# See: https://github.com/client9/libinjection#embedding
+Provides: bundled(libinjection) = 3.9.2
+
+%description
+Libmodsecurity is one component of the ModSecurity v3 project.
+The library codebase serves as an interface to ModSecurity Connectors
+taking in web traffic and applying traditional ModSecurity processing.
+In general, it provides the capability to load/interpret rules written
+in the ModSecurity SecRules format and apply them to HTTP content provided
+by your application via Connectors.
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package static
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description static
+The %{name}-static package contains static libraries for developing
+applications that use %{name}.
+
+
+
+%prep
+%autosetup -n modsecurity-v%{version}
+
+
+%build
+%configure --libdir=%{_libdir} --with-lmdb
+%make_build
+
+
+%install
+%make_install
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc README.md AUTHORS
+%{_libdir}/*.so.*
+%{_bindir}/*
+%license LICENSE
+
+%files devel
+%doc README.md AUTHORS
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig
+%license LICENSE
+%doc modsecurity.conf-recommended unicode.mapping
+
+%files static
+%{_libdir}/*.a
+%{_libdir}/*.la
+
+
+%changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.3-3
+- initial build for Vine Linux.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Mar 31 2019 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.3-1
+- Update to 3.0.3 (rhbz #1672678)
+- Remove pkg-config bits since it's included in this release
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 19 2018 Dridi Boukelmoune <dridi@fedoraproject.org> - 3.0.2-4
+- Back-port of modsecurity.pc
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Apr 29 2018 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.2-2
+- Rebuild after PR#1
+
+* Sat Apr 14 2018 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.2-1
+- Update to 3.0.2 (rhbz #1563219)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Jan 21 2018 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0 final release
+- Drop upstreamed patch
+- Add some new BRs
+
+* Sun Oct 22 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-0.2.rc1
+- Add a patch to fix the build on non-x86 arch
+
+* Fri Sep 01 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-0.1.rc1
+- Fix release tag
+
+* Wed Aug 30 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-0.rc1
+- Update to RC1
+- Fix some spec issues
+
+* Mon Feb 22 2016 Athmane Madjoudj <athmane@fedoraproject.org> 3.0-0.git
+- Initial release
+

+ 11 - 12
lib/libs/libssh2/libssh2-vl.spec

@@ -3,7 +3,7 @@
 Summary:        A library implementing the SSH2 protocol
 Summary(ja):    SSH2 プロトコルを実装するためのライブラリ
 Name:           libssh2
-Version:        1.8.2
+Version:        1.9.0
 Release:        1%{?_dist_release}
 
 Vendor:         Project Vine
@@ -11,9 +11,8 @@ Distribution:   Vine Linux
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.libssh2.org/
-Source0:        http://downloads.sourceforge.net/libssh2/%{name}-%{version}.tar.gz
-Patch1:         0001-scp-do-not-NUL-terminate-the-command-for-remote-exec.patch
+URL:            https://www.libssh2.org/
+Source0:        https://www.libssh2.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  openssl-devel
@@ -62,11 +61,6 @@ SECSH-DHGEX(04), and SECSH-NUMBERS(10).
 %prep
 %setup -q
 
-# scp: do not NUL-terminate the command for remote exec
-# https://bugzilla.redhat.com/show_bug.cgi?id=1489736
-# https://github.com/libssh2/libssh2/pull/208
-%patch1 -p1
-
 # Replace hard wired port number in the test suite to avoid collisions
 # between 32-bit and 64-bit builds running on a single build-host
 sed -i s/4711/47%{__isa_bits}/ tests/ssh2.{c,sh}
@@ -111,17 +105,19 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README NEWS
+%license COPYING
+%doc NEWS README* RELEASE-NOTES
 %{_libdir}/*.so.*
 
 %files docs
 %defattr(-,root,root,-)
-%doc COPYING example/ docs/HACKING
+%license COPYING
+%doc example/ docs/HACKING
 %{_mandir}/man?/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING 
+%license COPYING
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libssh2.pc
@@ -133,6 +129,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.0-1
+- new upstream release.
+
 * Thu Mar 28 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.2-1
 - new upstream release.
 

+ 60 - 16
n/nginx/nginx-vl.spec

@@ -6,11 +6,12 @@
 # build http_geoip_module
 %if "%{_dist_release}" >= "vl7"
 %bcond_without geoip
+%bcond_without geoip2
+%bcond_without naxsi
+%bcond_without modsecurity
 %else
 %bcond_with geoip
 %endif
-%bcond_without geoip2
-%bcond_without naxsi
 
 %global nginx_modulesdir %{_libdir}/nginx/modules
 %global nginx_modconfdir %{_sysconfdir}/nginx/modules.d
@@ -34,7 +35,7 @@ Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロ
 Name:           nginx
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -90,6 +91,12 @@ Source2021:  naxsi_params
 Source2030: https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_version}.tar.gz#/ngx_http_geoip2_module-3.2.tar.gz
 %endif
 
+%if %{with modsecurity}
+%global with_modsecurity 1
+%global modsecurity_version 1.0.0
+Source2040: https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
+%endif
+
 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 Patch0:     nginx-auto-cc-gcc.patch
@@ -159,7 +166,7 @@ Requires: ruby-rubygems
 BuildRequires: rubygems
 Requires: rubygems
 %endif
-Requires: %{name} = %{nginx_version}
+Requires: %{name} = %{nginx_version}-%{release}
 
 %description passenger
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
@@ -177,7 +184,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
 %package geoip
 Summary:           Nginx HTTP geoip module
 BuildRequires:     GeoIP-devel
-Requires:          nginx = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          GeoIP
 
 %description geoip
@@ -187,7 +194,7 @@ Requires:          GeoIP
 %package image-filter
 Summary:           Nginx HTTP image filter module
 BuildRequires:     gd-devel
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          gd
 
 %description image-filter
@@ -197,7 +204,7 @@ Requires:          gd
 Summary:           Nginx HTTP perl module
 BuildRequires:     perl
 BuildRequires:     perl(ExtUtils::Embed)
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
@@ -206,21 +213,21 @@ Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve
 %package xslt-filter
 Summary:           Nginx XSLT module
 BuildRequires:     libxslt-devel
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description xslt-filter
 %{summary}.
 
 %package mail
 Summary:           Nginx mail modules
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description mail
 %{summary}.
 
 %package stream
 Summary:           Nginx stream modules
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description stream
 %{summary}.
@@ -228,7 +235,7 @@ Requires:          %{name} = %{nginx_version}
 %package dav-ext
 Summary:           Nginx dav-ext modules
 Version:           %{nginx_dav_ext_module_version}
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description dav-ext
 %{summary}.
@@ -238,7 +245,7 @@ Requires:          %{name} = %{nginx_version}
 Summary:           Nginx HTTP geoip2 modules
 Version:           %{geoip2_version}
 BuildRequires:     libmaxminddb-devel
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description http-geoip2
 %{summary}.
@@ -247,8 +254,8 @@ Requires:          %{name} = %{nginx_version}
 Summary:           Nginx stream geoip2 modules
 Version:           %{geoip2_version}
 BuildRequires:     libmaxminddb-devel
-Requires:          %{name} = %{nginx_version}
-Requires:          %{name}-stream = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
+Requires:          %{name}-stream = %{nginx_version}-%{release}
 
 %description stream-geoip2
 %{summary}.
@@ -260,7 +267,7 @@ Summary:           an open-source, high performance, low rules maintenance WAF f
 Summary(ja):       NGiNXのためのOSS・高パフォーマンス・低メンテナンスコストなWAF
 Version:           %{naxsi_version}
 License:           GPL3
-Requires:          %{name} = %{nginx_version}
+Requires:          %{name} = %{nginx_version}-%{release}
 
 %description naxsi
 NAXSI means Nginx Anti XSS & SQL Injection.
@@ -281,9 +288,25 @@ rules regarding a website's behaviour.
 to add required ACCEPT rules for the target website to work properly.
 %endif
 
+%if %{with modsecurity}
+%package modsecurity
+Summary:           The ModSecurity-nginx connector
+Summary(ja):       ModSecurity Nginxコネクター
+Version:           %{modsecurity_version}
+License:           ASL 2.0
+BuildRequires:     libmodsecurity-devel
+Requires:          %{name} = %{nginx_version}-%{release}
+
+%description modsecurity
+ The ModSecurity-nginx connector is the connection point between
+nginx and libmodsecurity (ModSecurity v3). Said another way, this
+project provides a communication channel between nginx and libmodsecurity.
+This connector is required to use LibModSecurity with nginx.
+%endif
+
 
 %prep
-%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010 %{?with_naxsi:-a 2020} %{?with_geoip2:-a 2030}
+%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010 %{?with_naxsi:-a 2020} %{?with_geoip2:-a 2030} %{?with_modsecurity:-a 2040}
 
 %patch0 -p0
 
@@ -364,6 +387,9 @@ CONFIGOPTS="\
 %endif
 %if %{with geoip2}
     --add-dynamic-module=ngx_http_geoip2_module-%{geoip2_version} \
+%endif
+%if %{with modsecurity}
+    --add-dynamic-module=modsecurity-nginx-v%{modsecurity_version} \
 %endif
     --add-dynamic-module=passenger-%{passenger_version}/src/nginx_module \
 %ifarch i686
@@ -469,6 +495,12 @@ echo 'load_module "%{nginx_modulesdir}/ngx_http_naxsi_module.so";' \
     > %{buildroot}%{nginx_modconfdir}/naxsi.conf
 %endif
 
+%if %{with modsecurity}
+# modsecurity module
+echo 'load_module "%{nginx_modulesdir}/ngx_http_modsecurity_module.so";' \
+    > %{buildroot}%{nginx_modconfdir}/modsecurity.conf
+%endif
+
 touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
 
 # convert to UTF-8 all files that give warnings.
@@ -618,7 +650,19 @@ fi
 %config(noreplace) %{nginx_modconfdir}/naxsi.conf
 %endif
 
+%if %{with modsecurity}
+%files modsecurity
+%defattr(-,root,root,-)
+%license modsecurity-%{mod_securiy_version}/LICENSE
+%doc modsecurity-%{mod_securiy_version}/README.md
+%{nginx_modulesdir}/ngx_http_modsecurity_module.so
+%config(noreplace) %{nginx_modconfdir}/modsecurity.conf
+%endif
+
 %changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-2
+- added ModSecurity module.
+
 * Sat Aug 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-1
 - updated to 1.16.1.
 - made to install NAXSI as a dynamic module.

+ 11 - 11
p/proftpd/proftpd-vl.spec

@@ -2,8 +2,8 @@
 %define _localstatedir	/var/run
 %define _sysconfdir	/etc
 %define _rundir		/var/run/proftpd
-%define tarballversion	1.3.5e
-%define origversion	1.3.5e
+%define tarballversion	1.3.6b
+%define origversion	1.3.6b
 
 Summary: ProFTPd -- Professional FTP Server.
 Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
@@ -15,21 +15,20 @@ License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
 
-Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{origversion}.tar.gz
+Source0: https://github.com/proftpd/proftpd/archive/v1.3.6b.tar.gz#/%{name}-%{origversion}.tar.gz
 Source1: proftpd.vine.conf
 Source2: ftpusers.vine
 Source3: proftpd.init
 Source5: welcome.msg
 
 # upstream bug fixes & security fixes
-Patch24: proftpd-1.3.5e-bug3745.patch
 
 # auth 
 Patch201: proftpd-1.3.1-use-system-auth-instead-of-pam_pwdb.patch
 
 # iconv patch (CharsetLocal/CharsetRemote)
 # Patch300: http://www.hakusan.tsg.ne.jp/tjkawa/software/misc/proftpd-iconv/pack/proftpd-1.3.0-iconv.patch.gz
-Patch300: proftpd-1.3.5b-iconv.patch
+Patch300: proftpd-1.3.6b-iconv.patch
 
 # fix build on recent kernel headers
 # Patch400: proftpd-1.3.1-umode.patch
@@ -84,10 +83,6 @@ find . -type d -name CVS | xargs -r rm -frv
 
 # upstream fixes
 
-# Reject PASV command if no IPv4 address available
-# http://bugs.proftpd.org/show_bug.cgi?id=3745
-%patch24 -p1
-
 ## patches from mdk
 # use system-auth instead of pam_pwdb
 %patch201 -p1
@@ -181,8 +176,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS ChangeLog INSTALL NEWS
-%doc README.{LDAP,PAM,modules} doc/*
+%license COPYING
+%doc CREDITS INSTALL NEWS
+%doc README.{md,LDAP,PAM,modules}
+%doc doc/*
 %doc contrib/README contrib/xferstats.holger-preiss
 %doc sample-configurations/
 %{_sbindir}/*
@@ -223,6 +220,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6b-1
+- new upstream release.
+
 * Fri Mar 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.5e-1
 - new upstream release.
 - remake patch24 for 1.3.5e

+ 168 - 0
s/ssdeep/ssdeep-vl.spec

@@ -0,0 +1,168 @@
+# spec file for ssdeep
+#
+# Copyright (c) 2014-2018 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+
+Name:           ssdeep
+Version:        2.14.1
+Release:        8%{?_dist_release}
+Summary:        Compute context triggered piecewise hashes
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            https://ssdeep-project.github.io/ssdeep/
+Source0:        https://github.com/ssdeep-project/ssdeep/releases/download/release-%{version}/ssdeep-%{version}.tar.gz
+
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+
+%description
+ssdeep is a program for computing context triggered piecewise hashes (CTPH).
+Also called fuzzy hashes, CTPH can match inputs that have homologies.
+Such inputs have sequences of identical bytes in the same order, although bytes
+in between these sequences may be different in both content and length.
+
+
+%package devel
+Summary: Development files for libfuzzy
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains library and header files for
+developing applications that use libfuzzy.
+
+
+%package libs
+Summary: Runtime libfuzzy library
+
+%description libs
+The %{name}-libs package contains libraries needed by applications
+that use libfuzzy.
+
+
+%prep
+%setup -q
+
+# avoid autotools being re-run
+touch -r aclocal.m4 configure configure.ac
+
+
+%build
+%configure \
+   --disable-auto-search \
+   --disable-static
+
+# rpath removal
+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 %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+rm %{buildroot}%{_libdir}/libfuzzy.la
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.*
+
+%files devel
+%doc FILEFORMAT NEWS README TODO
+%{_includedir}/fuzzy.h
+%{_includedir}/edit_dist.h
+%{_libdir}/libfuzzy.so
+
+%files libs
+%license COPYING
+%{_libdir}/libfuzzy.so.2*
+
+
+%changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.14.1-8
+- initial build for Vine Linux.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 2.14.1-4
+- missing BR on C/C++ compilers
+
+* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 2.14.1-3
+- drop ldconfig scriptlets
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov  7 2017 Remi Collet <remi@fedoraproject.org> - 2.14.1-1
+- update to 2.14.1
+
+* Fri Sep 15 2017 Remi Collet <remi@fedoraproject.org> - 2.14-1
+- update to 2.14
+- sources from github
+- fix project URL
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue May  5 2015 Remi Collet <remi@fedoraproject.org> - 2.13-1
+- update to 2.13
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.12-2
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Sun Oct 26 2014 Remi Collet <remi@fedoraproject.org> - 2.12-1
+- update to 2.12
+
+* Mon Sep 29 2014 Remi Collet <remi@fedoraproject.org> - 2.11.1-1
+- update to 2.11.1 (no change)
+- fix license handling
+
+* Fri Sep 12 2014 Remi Collet <remi@fedoraproject.org> - 2.11-1
+- update to 2.11
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Jan 22 2014 Remi Collet <remi@fedoraproject.org> - 2.10-2
+- cleanup build path (comment from review #1056460)
+
+* Wed Jan 22 2014 Remi Collet <remi@fedoraproject.org> - 2.10-1
+- initial package

+ 26 - 26
y/yajl/yajl-vl.spec

@@ -1,11 +1,14 @@
-Name: yajl
-Summary: Yet Another JSON Library (YAJL)
-Version: 2.0.4
-Release: 1%{?_dist_release}
+Name:           yajl
+Summary:        Yet Another JSON Library (YAJL)
+Version:        2.1.0
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
 
-Group: System Environment/Libraries
-License: ISC
-URL: http://lloyd.github.com/yajl/
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        ISC
+URL:            http://lloyd.github.com/yajl/
 
 #
 # NB, upstream does not provide pre-built tar.gz downloads. Instead
@@ -14,22 +17,13 @@ URL: http://lloyd.github.com/yajl/
 #
 # The Source0 for any version is obtained by a URL
 #
-#   http://github.com/lloyd/yajl/tarball/1.0.7
-#
-# Which causes a download of a archive named after
-# the GIT hash corresponding to the version tag
-#
-#   eg lloyd-yajl-45a1bdb.tar.gz
+#   https://github.com/lloyd/yajl/releases/tag/2.1.0
 #
-# NB even though the tar.gz is generated on the fly by GITHub it
-# will always have identical md5sum
-#
-# So for new versions, update 'githash' to match the hash of the
-# GIT tag associated with updated 'Version:' field just above
-%global githash fee1ebe
-Source0: lloyd-%{name}-%{version}-0-g%{githash}.tar.gz
-Patch1: lloyd-%{name}-%{version}-pkgconfig-location.patch
-Patch2: lloyd-%{name}-%{version}-pkgconfig-includedir.patch
+Source0: %{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-pkgconfig-location.patch
+Patch2: %{name}-%{version}-pkgconfig-includedir.patch
+Patch3: %{name}-%{version}-test-location.patch
+Patch4: %{name}-%{version}-dynlink-binaries.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
@@ -53,9 +47,11 @@ This sub-package provides the libraries and includes
 necessary for developing against the YAJL library
 
 %prep
-%setup -q -n lloyd-%{name}-%{githash}
+%setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # NB, we are not using upstream's 'configure'/'make'
@@ -79,7 +75,8 @@ rm -f %{buildroot}%{_libdir}/libyajl_s.a
 
 %check
 cd test
-./run_tests.sh
+(cd parsing && ./run_tests.sh)
+(cd api && ./run_tests.sh)
 
 %clean
 rm -rf %{buildroot}
@@ -90,7 +87,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README TODO
+%license COPYING
+%doc ChangeLog README TODO
 %{_bindir}/json_reformat
 %{_bindir}/json_verify
 %{_libdir}/libyajl.so.2
@@ -98,7 +96,6 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING
 %dir %{_includedir}/yajl
 %{_includedir}/yajl/yajl_common.h
 %{_includedir}/yajl/yajl_gen.h
@@ -110,6 +107,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.1.0-1
+- new upstream release.
+
 * Tue Oct 29 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.4-1
 - updated to 2.0.4 release
 - Patch1 and Patch2 imported from Fedora