lighttpd: remove patches incorporated upstream

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>

diff --git a/net/lighttpd/patches/010-mariadb.patch b/net/lighttpd/patches/010-mariadb.patch
deleted file mode 100644 (file)
index f8cf31d..0000000
--- a/net/lighttpd/patches/010-mariadb.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 04a7d98cb91139d79dd14cbdb0522d3d5898dd12 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Fri, 10 Jul 2020 20:40:07 -0700
-Subject: [PATCH] [meson] fix libmariadb dependency
-
-libmariadb is what should be used as only the library portion is used.
-
-Fixes compilation under OpenWrt.
-
-Note that mariadb.pc is a superset that links to libmariadb.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 43ef9540..d39cf1c0 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -387,7 +387,7 @@ if get_option('with_mysql')
-       # manual search: extend include path with 'mysql/'
-       # header: mysql.h
-       # function: mysql_real_connect (-lmariadb)
--      libmysqlclient = [ dependency('mariadb') ]
-+      libmysqlclient = [ dependency('libmariadb') ]
-       #-# function: mysql_real_connect (-lmysqlclient)
-       #-libmysqlclient = [ dependency('mysqlclient') ]
-       conf_data.set('HAVE_MYSQL', true)

diff --git a/net/lighttpd/patches/020-maxminddb.patch b/net/lighttpd/patches/020-maxminddb.patch
deleted file mode 100644 (file)
index 8eb8869..0000000
--- a/net/lighttpd/patches/020-maxminddb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd2a12d6362aad2013ba558537647e46419d7595 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Fri, 10 Jul 2020 21:20:52 -0700
-Subject: [PATCH] [meson] add missing libmaxminddb section
-
-Fixes the following error when building with -Dwith_maxminddb=true:
-
-meson.build:916:1: ERROR: Unknown variable "libmaxminddb".
-
-A full log can be found at meson-logs/meson-log.txt
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- src/meson.build | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/meson.build b/src/meson.build
-index d39cf1c0..2191c9bc 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -255,6 +255,14 @@ if get_option('with_fam')
-       conf_data.set('HAVE_FAM_H', true)
- endif
- 
-+libmaxminddb = []
-+if get_option('with_maxminddb')
-+      libmaxminddb = [ compiler.find_library('maxminddb') ]
-+      if not(compiler.has_function('MMDB_open', args: defs, dependencies: libmaxminddb, prefix: '#include <maxminddb.h>'))
-+              error('Couldn\'t find maxminddb.h or MMDB_open in lib maxminddb')
-+      endif
-+endif
-+
- libgeoip = []
- if get_option('with_geoip')
-       libgeoip = dependency('geoip', required: false)