diff --git a/server/web/apache/pspec.xml b/server/web/apache/pspec.xml
index c1d7de3783..aad52a8828 100644
--- a/server/web/apache/pspec.xml
+++ b/server/web/apache/pspec.xml
@@ -13,7 +13,7 @@
service
Apache web server
Apache HTTP Server is a free software/open source web server for Unix-like systems, Microsoft Windows, Novell NetWare and other operating systems. Apache is notable for playing a key role in the initial growth of the World Wide Web, and continues to be the most popular web server in use, serving as the de facto reference platform against which other web servers are designed and judged.
- http://archive.apache.org/dist/httpd/httpd-2.4.25.tar.bz2
+ http://archive.apache.org/dist/httpd/httpd-2.4.29.tar.bz2
apr-devel
nss-devel
@@ -57,11 +57,11 @@
/usr/share/doc
/usr/share/man
/usr/lib
- /lib/systemd/system
+ /usr/share/dbus-1/services/apache.service
- apache.service
+ apache.service
apache2.confd
@@ -91,6 +91,13 @@
+
+ 2018-05-17
+ 2.4.29
+ Version Bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2017-03-19
2.4.25
diff --git a/util/admin/pisiyap/files/devel-package.patch b/util/admin/pisiyap/files/devel-package.patch
new file mode 100644
index 0000000000..5e744c9628
--- /dev/null
+++ b/util/admin/pisiyap/files/devel-package.patch
@@ -0,0 +1,25 @@
+diff -Nuar a/libpisiyap/templates/pspec.py b/libpisiyap/templates/pspec.py
+--- a/libpisiyap/templates/pspec.py 2016-05-16 15:49:45.000000000 +0300
++++ b/libpisiyap/templates/pspec.py 2018-05-16 23:27:49.323840586 +0300
+@@ -77,7 +77,20 @@
+
+ -->
+
+-
++
+
+
+ %(date)s
diff --git a/util/admin/pisiyap/files/meson_tools.patch b/util/admin/pisiyap/files/meson_tools.patch
new file mode 100644
index 0000000000..61133ca9d9
--- /dev/null
+++ b/util/admin/pisiyap/files/meson_tools.patch
@@ -0,0 +1,68 @@
+diff -Nuar a/libpisiyap/gui/pisiyapui.py b/libpisiyap/gui/pisiyapui.py
+--- a/libpisiyap/gui/pisiyapui.py 2016-05-16 15:49:45.000000000 +0300
++++ b/libpisiyap/gui/pisiyapui.py 2018-05-17 01:45:14.000000000 +0300
+@@ -315,6 +315,8 @@
+ self.gridLayout_9.addWidget(self.pyTools, 2, 3, 1, 1)
+ self.sconsTools = QRadioButton(self.tab_5)
+ self.gridLayout_9.addWidget(self.sconsTools, 2, 5, 1, 1)
++ self.mesonTools = QRadioButton(self.tab_5)
++ self.gridLayout_9.addWidget(self.mesonTools, 4, 5, 1, 1)
+ spacerItem20 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+ self.gridLayout_9.addItem(spacerItem20, 1, 3, 1, 1)
+ spacerItem21 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+@@ -504,6 +506,8 @@
+ self.pyTools.setText(self.tr("Python Tools"))
+ self.sconsTools.setToolTip(self.tr("Select this option if the package is built with scons tools"))
+ self.sconsTools.setText(self.tr("SCons Tools"))
++ self.mesonTools.setToolTip(self.tr("Select this option if the package is built with meson tools"))
++ self.mesonTools.setText(self.tr("Meson Tools"))
+ self.backBut_3.setText(self.tr("Back"))
+ self.nextBut_3.setText(self.tr("Next"))
+ self.pisiyapTab.setTabText(self.pisiyapTab.indexOf(self.tab_5), "actions.py")
+diff -Nuar a/libpisiyap/pisiyap.py b/libpisiyap/pisiyap.py
+--- a/libpisiyap/pisiyap.py 2016-05-16 15:49:45.000000000 +0300
++++ b/libpisiyap/pisiyap.py 2018-05-17 01:28:06.000000000 +0300
+@@ -292,6 +292,8 @@
+ actionspy = actions.pyTools
+ elif self.ui.sconsTools.isChecked():
+ actionspy = actions.sconsTools
++ elif self.ui.mesonTools.isChecked():
++ actionspy = actions.mesonTools
+
+ actionsPy = file(os.path.join(packageDir, 'actions.py'), 'w')
+ actionsPy.write(actionspy)
+diff -Nuar a/libpisiyap/templates/actions.py b/libpisiyap/templates/actions.py
+--- a/libpisiyap/templates/actions.py 2016-05-16 15:49:45.000000000 +0300
++++ b/libpisiyap/templates/actions.py 2018-05-17 01:21:05.000000000 +0300
+@@ -175,3 +175,31 @@
+
+ pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "NEWS", "README")
+ '''
++
++mesonTools = u'''#!/usr/bin/env python
++# -*- coding: utf-8 -*-
++#
++# Licensed under the GNU General Public License, version 3.
++# See the file http://www.gnu.org/licenses/gpl.txt
++
++from pisi.actionsapi import autotools
++from pisi.actionsapi import pisitools
++from pisi.actionsapi import shelltools
++from pisi.actionsapi import get
++
++def setup():
++ shelltools.makedirs("build")
++ shelltools.cd("build")
++ shelltools.system("meson .. --prefix=/usr")
++
++def build():
++ shelltools.cd("build")
++ shelltools.system("ninja")
++
++def install():
++ shelltools.cd("build")
++ shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
++
++ shelltools.cd("..")
++ pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "NEWS", "README")
++'''
diff --git a/util/admin/pisiyap/pspec.xml b/util/admin/pisiyap/pspec.xml
index 3a70e450ab..00cea82b28 100644
--- a/util/admin/pisiyap/pspec.xml
+++ b/util/admin/pisiyap/pspec.xml
@@ -20,7 +20,11 @@
python-qt5-devel
python-setuptools
qt5-linguist
-
+
+
+ devel-package.patch
+ meson_tools.patch
+
@@ -55,6 +59,13 @@
+
+ 2018-05-16
+ 0.7b
+ Rebuild
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2017-06-21
0.7b