Merge pull request #915 from Rmys/master

grub2:revert 2.02 error boot/grub2/locale/*.mo
2019-10-13 17:59:38 +03:00 · 2019-10-13 17:58:22 +03:00 · 2019-10-11 19:39:31 +03:00 · 2019-10-11 19:37:46 +03:00 · 2019-10-06 12:57:19 +03:00 · 2019-10-06 09:24:01 +03:00
1205 changed files with 2838500 additions and 216213 deletions
@@ -4,3 +4,4 @@
 *.svn
 *~
 .dir*
+*.log
@@ -10,7 +10,7 @@ Paketleme Kuralları;

 1. Core kaynak deposunda minimum X bağımlılığı hedeflenmiştir.

-1. configure seçeneklerinde belge oluşturmaya yönelik seçenekler açılmamalı, bağımlılıklar yazılamalıdır.
+1. configure seçeneklerinde belge oluşturmaya yönelik seçenekler açılmamalı, bağımlılıklar yazılmalıdır.

 1. configure seçeneklerinde pakete yeni bağımlılık getirecek değişiklikler için mutlaka issue açılmalı, tartışılmadan pull request istenmemelidir.

@@ -11,7 +11,8 @@ from pisi.actionsapi import get

 def setup():
    autotools.configure("--disable-static \
-                         --with-harfbuzz=no")
+                         --with-harfbuzz=no \
+                         --enable-freetype-config")

 def build():
    autotools.make()
@@ -3,7 +3,7 @@
 <PISI>
    <Source>
        <Name>freetype</Name>
-        <Homepage>http://www.freetype.org/</Homepage>
+        <Homepage>https://www.freetype.org/</Homepage>
        <Packager>
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
@@ -13,7 +13,7 @@
        <IsA>library</IsA>
        <Summary>A high-quality and portable font engine</Summary>
        <Description>FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well.</Description>
-        <Archive sha1sum="cd2b144205dd2c61693e2d861069367aa3dde1bc" type="tarbz2">mirrors://sourceforge/freetype/freetype-2.6.tar.bz2</Archive>
+        <Archive sha1sum="79874ef4eaa52025126b71d836453b8279bdd331" type="tarxz">mirrors://sourceforge/freetype/freetype-2.10.1.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>zlib-devel</Dependency>
            <Dependency>bzip2</Dependency>
@@ -46,8 +46,8 @@
        <Files>
            <Path fileType="executable">/usr/bin</Path>
            <Path fileType="header">/usr/include</Path>
-            <Path fileType="data">/usr/lib/pkgconfig</Path>
-            <Path fileType="data">/usr/lib32/pkgconfig</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
            <Path fileType="data">/usr/share/aclocal</Path>
        </Files>
    </Package>
@@ -62,7 +62,7 @@
            <Dependency>libpng-32bit</Dependency>
        </BuildDependencies>
        <RuntimeDependencies>
-            <Dependency>glibc-32bit</Dependency>
+            
            <Dependency>zlib-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
        </RuntimeDependencies>
@@ -72,82 +72,54 @@
    </Package>

    <History>
-        <Update release="11">
-            <Date>2015-07-29</Date>
-            <Version>2.6</Version>
-            <Comment>Version bump.</Comment>
+		<Update release="7">
+            <Date>2019-08-01</Date>
+            <Version>2.10.1</Version>
+            <Comment>Version bump</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
+		<Update release="6">
+            <Date>2019-06-09</Date>
+            <Version>2.10.0</Version>
+            <Comment>Version bump</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
+        <Update release="5">
+            <Date>2018-07-23</Date>
+            <Version>2.9</Version>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="10">
-            <Date>2015-05-22</Date>
-            <Version>2.5.5</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ayhan Yalçınsoy</Name>
-            <Email>ayhanyalcinsoy@pisilinux.org</Email>
-        </Update>
-        <Update release="9">
-            <Date>2014-05-11</Date>
-            <Version>2.5.3</Version>
-            <Comment>Release bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="8">
-            <Date>2014-03-29</Date>
-            <Version>2.5.3</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="7">
-            <Date>2013-12-11</Date>
-            <Version>2.5.2</Version>
-            <Comment>Version bump, cleanup.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="6">
-            <Date>2013-11-26</Date>
-            <Version>2.5.1</Version>
-            <Comment>Version bump</Comment>
-            <Name>Richard de Bruin</Name>
-            <Email>richdb@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2013-10-28</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>rebuild.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
        <Update release="4">
-            <Date>2013-07-26</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>Fix deps,release bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-17</Date>
+            <Version>2.9</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-06-28</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-02-02</Date>
+            <Version>2.7.1</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-01-14</Date>
-            <Version>2.4.11</Version>
-            <Comment>New release</Comment>
+            <Date>2016-04-27</Date>
+            <Version>2.6.3</Version>
+            <Comment>Release Bump</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-24</Date>
-            <Version>2.4.10</Version>
+            <Date>2016-03-13</Date>
+            <Version>2.6.3</Version>
            <Comment>First release</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
        </Update>
    </History>
 </PISI>
@@ -1,403 +1,25 @@
 <PISI>
    <SourceName>PisiLinux</SourceName>
-    <Version>1.0</Version>
-    <Description xml:lang="tr">PisiLinux 1.0 Deposu</Description>
-    <Description xml:lang="en">PisiLinux 1.0 Repository</Description>
-    <Description xml:lang="es">PisiLinux 1.0 Repositorio</Description>
-    <Description xml:lang="nl">PisiLinux 1.0 Opslagplaats</Description>
+    <Version>2.0</Version>
+    <Description xml:lang="tr">PisiLinux 2.0 Core Deposu</Description>
+    <Description xml:lang="en">PisiLinux 2.0 Core Repository</Description>
+    <Description xml:lang="es">PisiLinux 2.0 Core Repositorio</Description>
+    <Description xml:lang="nl">PisiLinux 2.0 Core Opslagplaats</Description>
    <Type>Core</Type>
    <BinaryName>PisiLinux</BinaryName>
    <Obsoletes>
-        <Package>xorg-video-modesetting</Package>
-        <Package>glamor-egl</Package>
-        <Package>glamor-egl-devel</Package>
-        <Package>kdeadmin</Package>
-        <Package>kdenetwork</Package>
-        <Package>kdenetwork-devel</Package>
-        <Package>kdesdk</Package>
-        <Package>kdesdk-devel</Package>
-        <Package>kdeplasma-applets-fancytasks</Package>
-        <Package>kdetoys</Package>
-        <Package>libfakeley</Package>
-        <Package>libfakeley-devel</Package>
-        <Package>libstreams</Package>
-        <Package>libstreamanalyzer</Package>
-        <Package>libstreams-devel</Package>
-        <Package>libstreamanalyzer-devel</Package>
-        <Package>strigi-libs</Package>
-        <Package>strigi-common</Package>
-        <Package>workspace-strap</Package>
-        <Package>gtk-qt-engine</Package>
-        <Package>kdevplatform-l10n-nds</Package>
-        <Package>kdevplatform-l10n-en_GB</Package>
-        <Package>db5</Package>
-        <Package>db5-devel</Package>
-        <Package>db5-docs</Package>
-        <Package>ntfs_3g</Package>
-        <Package>db4-java</Package>
-        <Package>db5-java</Package>
-        <Package>jpeg</Package>
-        <Package>openthreads</Package>
-        <Package>aufs-progs</Package>
-        <Package>python-cherrypy</Package>
-        <Package>hd2u</Package>
-        <Package>mmpython</Package>
-        <Package>libtextcat</Package>
-        <Package>xorg-input-fpit</Package>
-        <Package>xorg-input-hyperpen</Package>
-        <Package>xorg-input-mutouch</Package>
-        <Package>xorg-input-penmount</Package>
-        <Package>xorg-video-ark</Package>
-        <Package>xorg-video-ast</Package>
-        <Package>xorg-video-chips</Package>
-        <Package>xorg-video-nv</Package>
-        <Package>xorg-video-s3</Package>
-        <Package>xorg-video-tseng</Package>
-        <Package>libXp-devel</Package>
-        <Package>ijs</Package>
-        <Package>ijs-devel</Package>
-        <Package>xfce-utils</Package>
-        <Package>lxsession-edit</Package>
-        <Package>zeitgeist-datahub</Package>
-        <Package>soundKonverter</Package>
-        <Package>module-fglrx-legacy</Package>
-        <Package>module-fglrx-legacy-userspace</Package>
-        <Package>module-fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-opencl</Package>
-        <Package>fglrx-legacy-opencl-32bit</Package>
-        <Package>xorg-video-fglrx-legacy</Package>
-        <Package>xorg-video-fglrx-legacy-32bit</Package>
-        <Package>fglrx-devel</Package>
-        <Package>fglrx-opencl-32bit</Package>
-        <Package>fglrx-opencl</Package>
-        <Package>module-fglrx-userspace</Package>
-        <Package>plex-media-server</Package>
-        <Package>libreoffice-bsh</Package>
-        <Package>libreoffice-ure</Package>
-        <Package>libreoffice-pyuno</Package>
-        <Package>libreoffice-nlpsolver</Package>
-        <Package>libreoffice-pdfimport</Package>
-        <Package>libreoffice-xsltfilter</Package>
-        <Package>libreoffice-java-common</Package>
-        <Package>libreoffice-graphicfilter</Package>
-        <Package>libreoffice-wiki-publisher</Package>
-        <Package>libreoffice-presentation-minimizer</Package>
-        <Package>libreoffice-javafilter</Package>
-        <Package>libreoffice-report-builder</Package>
-        <Package>glest</Package>
-        <Package>glest-data</Package>
-        <Package>liboldX</Package>
-        <Package>liboldX-devel</Package>
-        <Package>glitz-devel</Package>
-        <Package>glitz-32bit</Package>
-        <Package>glitz</Package>
-        <Package>mate-bluetooth</Package>
-        <Package>mate-bluetooth-devel</Package>
-        <Package>mate-bluetooth-doc</Package>
-        <Package>glade-xfce</Package>
-        <Package>eatmonkey</Package>
-        <Package>gnome-activity-journal</Package>
-        <Package>gnome-mime-data</Package>
-        <Package>libgnomecups</Package>
-        <Package>libgnomecups-devel</Package>
-        <Package>libgnomeprint</Package>
-        <Package>libgnomeprint-devel</Package>
-        <Package>libgnomeprint-docs</Package>
-        <Package>libgnomeprintui</Package>
-        <Package>libgnomeprintui-devel</Package>
-        <Package>libgnomeprintui-docs</Package>
-        <Package>gnome-desktop-sharp</Package>
-        <Package>gnome-desktop-sharp-devel</Package>
-        <Package>gnome-print-sharp</Package>
-        <Package>gnome-print-sharp-devel</Package>
-        <Package>gtksourceview-sharp</Package>
-        <Package>gtksourceview-sharp-devel</Package>
-        <Package>vte-sharp</Package>
-        <Package>vte-sharp-devel</Package>
-        <Package>wnck-sharp</Package>
-        <Package>wnck-sharp-devel</Package>
-        <Package>rsvg-sharp</Package>
-        <Package>rsvg-sharp-devel</Package>
-        <Package>gsettings-desktop-schemas3</Package>
-        <Package>gsettings-desktop-schemas3-devel</Package>
-        <Package>libgee-8</Package>
-        <Package>libgee-8-devel</Package>
-        <Package>gnutls-guile</Package>
-        <Package>liborcus</Package>
-        <Package>liborcus-devel</Package>
-        <Package>libixion</Package>
-        <Package>epdfview</Package>
-        <Package>libixion-devel</Package>
-        <Package>lv2core</Package>
-        <Package>lv2core-devel</Package>
-        <Package>amd-ucode</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>perl-Email-Simple-Creator</Package>
-        <Package>licq-autoreply</Package>
-        <Package>licq-console</Package>
-        <Package>licq-msn</Package>
-        <Package>licq-forwarder</Package>
-        <Package>licq-osd</Package>
-        <Package>licq-rms</Package>
-        <Package>licq-devel</Package>
-        <Package>perl-IO-via-symlink</Package>
-        <Package>SVK</Package>
-        <Package>avidemux</Package>
-        <Package>qsvn</Package>
-        <Package>libsvnqt</Package>
-        <Package>libsvnqt-devel</Package>
-        <Package>cups-php</Package>
-        <Package>metalink</Package>
-        <Package>foomatic-filters</Package>
-        <Package>pisilinux-default-settings</Package>
-        <Package>mysql-client</Package>
-        <Package>mysql-lib</Package>
-        <Package>mysql-man-pages</Package>
-        <Package>mysql-server</Package>
-        <Package>sun-jre</Package>
-        <Package>sun-jdk</Package>
-        <Package>gnash</Package>
-        <Package>gnash-devel</Package>
-        <Package>gnash-klash</Package>
-        <Package>gst-buzztard</Package>
-        <Package>gst-buzztard-doc</Package>
-        <Package>libgst-buzztard</Package>
-        <Package>libgst-buzztard-devel</Package>
-        <Package>tv-viewer</Package>
-        <Package>module-nvidia-current-userspace</Package>
-        <Package>module-nvidia304-userspace</Package>
-        <Package>module-nvidia173-userspace</Package>
-        <Package>module-nvidia96-userspace</Package>
-        <Package>samba-swat</Package>
-        <Package>comp-scale</Package>
-        <Package>ntrack</Package>
-        <Package>ntrack-devel</Package>
-        <Package>ntrack-glib</Package>
-        <Package>ntrack-glib-devel</Package>
-        <Package>ntrack-gobject</Package>
-        <Package>ntrack-gobject-devel</Package>
-        <Package>ntrack-qt4</Package>
-        <Package>ntrack-qt4-devel</Package>
-        <Package>python-ntrack</Package>
-        <Package>qzion</Package>
-        <Package>qzion-devel</Package>
-        <Package>qedje-devel</Package>
-        <Package>qedje</Package>
-        <Package>ushare</Package>
-        <Package>udev-32bit</Package>
-        <Package>kde-l10n-si</Package>
-        <Package>kde-l10n-si-doc</Package>
-        <Package>kde-l10n-tg</Package>
-        <Package>kde-l10n-tg-doc</Package>
-        <Package>kde-l10n-th</Package>
-        <Package>kde-l10n-th-doc</Package>
-        <Package>kdnssd</Package>
-        <Package>mate-file-manager</Package>
-        <Package>mate-file-manager-devel</Package>
-        <Package>mate-file-manager-doc</Package>
-        <Package>mate-window-manager</Package>
-        <Package>mate-window-manager-devel</Package>
-        <Package>mate-doc-utils</Package>
-        <Package>libmatewnck-devel</Package>
-        <Package>libmatewnck-doc</Package>
-        <Package>libmatewnck</Package>
-        <Package>libmatekeyring</Package>
-        <Package>libmatekeyring-devel</Package>
-        <Package>libmatekeyring-doc</Package>
-        <Package>mate-keyring</Package>
-        <Package>mate-keyring-devel</Package>
-        <Package>mate-keyring-doc</Package>
-        <Package>mate-character-map</Package>
-        <Package>mate-character-map-devel</Package>
-        <Package>mate-document-viewer</Package>
-        <Package>mate-document-viewer-devel</Package>
-        <Package>mate-document-viewer-doc</Package>
-        <Package>mate-file-archiver</Package>
-        <Package>mate-image-viewer</Package>
-        <Package>mate-image-viewer-devel</Package>
-        <Package>mate-image-viewer-doc</Package>
-        <Package>mate-file-manager-gksu</Package>
-        <Package>mate-file-manager-sendto</Package>
-        <Package>mate-file-manager-sendto-devel</Package>
-        <Package>mate-file-manager-sendto-doc</Package>
-        <Package>mate-file-manager-share</Package>
-        <Package>mate-file-manager-open-terminal</Package>
-        <Package>mate-file-manager-image-converter</Package>
-        <Package>mate-text-editor</Package>
-        <Package>mate-text-editor-devel</Package>
-        <Package>mate-text-editor-gtk-doc</Package>
-        <Package>mate-menu-editor</Package>
-        <Package>kio-afc</Package>
-        <Package>epson-alc1100</Package>
-        <Package>thunderbird-lang-es-CL</Package>
-        <Package>emacs-emms</Package>
-        <Package>ecore</Package>
-        <Package>ecore-devel</Package>
-        <Package>edje</Package>
-        <Package>edje-devel</Package>
-        <Package>eet</Package>
-        <Package>eet-devel</Package>
-        <Package>eeze</Package>
-        <Package>eeze-devel</Package>
-        <Package>efreet</Package>
-        <Package>efreet-devel</Package>
-        <Package>eina</Package>
-        <Package>eina-devel</Package>
-        <Package>eio</Package>
-        <Package>eio-devel</Package>
-        <Package>emap</Package>
-        <Package>emap-devel</Package>
-        <Package>embryo</Package>
-        <Package>embryo-devel</Package>
-        <Package>epdf</Package>
-        <Package>epdf-devel</Package>
-        <Package>ethumb</Package>
-        <Package>ethumb-devel</Package>
-        <Package>evas</Package>
-        <Package>evas-devel</Package>
-        <Package>emotion-devel</Package>
-        <Package>emotion</Package>
-        <Package>firefox-devel</Package>
-        <Package>chipmunk</Package>
-        <Package>chipmunk-devel</Package>
-        <Package>e-module-alarm</Package>
-        <Package>e-module-calendar</Package>
-        <Package>e-module-comp-scale</Package>
-        <Package>e-module-cpu</Package>
-        <Package>e-module-deskshow</Package>
-        <Package>e-module-diskio</Package>
-        <Package>e-module-drawer</Package>
-        <Package>e-module-eektool</Package>
-        <Package>e-module-eenvader-fractal</Package>
-        <Package>e-module-elfe</Package>
-        <Package>e-module-empris</Package>
-        <Package>e-module-engage</Package>
-        <Package>e-module-eooorg</Package>
-        <Package>e-module-everything-aspell</Package>
-        <Package>e-module-everything-pidgin</Package>
-        <Package>e-module-everything-places</Package>
-        <Package>e-module-everything-shotgun</Package>
-        <Package>e-module-everything-skeleton</Package>
-        <Package>e-module-everything-tracker</Package>
-        <Package>e-module-everything-wallpaper</Package>
-        <Package>e-module-everything-websearch</Package>
-        <Package>e-module-eweather</Package>
-        <Package>e-module-exebuf</Package>
-        <Package>e-module-execwatch</Package>
-        <Package>e-module-flame</Package>
-        <Package>e-module-forecasts</Package>
-        <Package>e-module-iiirk</Package>
-        <Package>e-module-itask</Package>
-        <Package>e-module-mail</Package>
-        <Package>e-module-mem</Package>
-        <Package>e-module-moon</Package>
-        <Package>e-module-mpdule</Package>
-        <Package>e-module-net</Package>
-        <Package>e-module-news</Package>
-        <Package>e-module-penguins</Package>
-        <Package>e-module-photo</Package>
-        <Package>e-module-places</Package>
-        <Package>e-module-rain</Package>
-        <Package>e-module-screenshot</Package>
-        <Package>e-module-skel</Package>
-        <Package>e-module-snow</Package>
-        <Package>e-module-taskbar</Package>
-        <Package>e-module-tclock</Package>
-        <Package>e-module-uptime</Package>
-        <Package>e-module-weather</Package>
-        <Package>e-module-winlist-ng</Package>
-        <Package>e-module-winselector</Package>
-        <Package>e-module-wlan</Package>
-        <Package>econcentration</Package>
-        <Package>editje</Package>
-        <Package>emprint</Package>
-        <Package>enki</Package>
-        <Package>enlil</Package>
-        <Package>enlil-devel</Package>
-        <Package>etrophy</Package>
-        <Package>etrophy-devel</Package>
-        <Package>expedite</Package>
-        <Package>lightmediascanner</Package>
-        <Package>lightmediascanner-devel</Package>
-        <Package>libeweather</Package>
-        <Package>libeweather-devel</Package>
-        <Package>python-elementary-devel</Package>
-        <Package>python-elementary</Package>
-        <Package>python-edje-devel</Package>
-        <Package>python-edje</Package>
-        <Package>python-evas-devel</Package>
-        <Package>python-evas</Package>
-        <Package>python-ethumb-devel</Package>
-        <Package>python-ethumb</Package>
-        <Package>python-ecore-devel</Package>
-        <Package>python-ecore</Package>
-        <Package>python-speech-dispatcher</Package>
-        <Package>nepomuk-core</Package>
-        <Package>nepomuk-core-devel</Package>
-        <Package>nepomuk-widgets</Package>
-        <Package>nepomuk-widgets-devel</Package>
-        <Package>wine-gecko64</Package>
-        <Package>wine64</Package>
-        <Package>glade3</Package>
-        <Package>glade3-devel</Package>
-        <Package>glade3-docs</Package>
-        <Package>goocanvas</Package>
-        <Package>goocanvas-docs</Package>
-        <Package>goocanvas-devel</Package>
-        <Package>goocanvasmm</Package>
-        <Package>goocanvasmm-doc</Package>
-        <Package>goocanvasmm-devel</Package>
-        <Package>libgtkhtml2</Package>
-        <Package>libgtkhtml2-devel</Package>
-        <Package>bluez-compat</Package>
-        <Package>bluedevil-devel</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>python-PyMT</Package>
-        <Package>python-PyMT-docs</Package>
-        <Package>OpenGTL</Package>
-        <Package>OpenGTL-devel</Package>
-        <Package>gtkdatabox-glade</Package>
-        <Package>gtkdatabox-docs</Package>
-        <Package>vo-aacenc</Package>
-        <Package>lxshortcut</Package>
-        <Package>libusbx</Package>
-        <Package>libusbx-devel</Package>
-        <Package>libusbx-32bit</Package>
-        <Package>labltk</Package>
-        <Package>udev</Package>
-        <Package>libudev</Package>
-        <Package>libgudev1</Package>
-        <Package>libudev-devel</Package>
-        <Package>libgudev1-devel</Package>
-        <Package>libudev-32bit</Package>
-        <Package>libgudev1-32bit</Package>
-        <Package>mdbtools-gui</Package>
-        <Package>module-nvidia96</Package>
-        <Package>xorg-video-nvidia96</Package>
-        <Package>module-nvidia173</Package>
-        <Package>xorg-video-nvidia173</Package>
-        <Package>libfm</Package>
-        <Package>libfm-devel</Package>
-        <Package>lxappearance</Package>
-        <Package>lxappearance-devel</Package>
-        <Package>lxappearance-obconf</Package>
-        <Package>lxde-common</Package>
-        <Package>lxde-menu-cache</Package>
-        <Package>lxde-menu-cache-devel</Package>
-        <Package>lxinput</Package>
-        <Package>lxmenu-data</Package>
-        <Package>lxpanel</Package>
-        <Package>lxpanel-devel</Package>
-        <Package>lxpolkit</Package>
-        <Package>lxrandr</Package>
-        <Package>lxsession</Package>
-        <Package>lxtask</Package>
-        <Package>lxterminal</Package>
-        <Package>pcmanfm</Package>
-        <Package>pcmanfm-devel</Package>
-        <Package>gpicview</Package>
-        <Package>lxlauncher</Package>
-        <Package>screengrab</Package>
-    </Obsoletes>
+           <!--glibc-32bit merge in glibc-->
+           <Package>glibc-32bit</Package>
+           <!-- separeted, replaced packages-->
+           <Package>kdgantt2</Package>
+           <Package>gpgmepp</Package>
+           <Package>kde-baseapps</Package>
+           <Package>prison-qt5</Package>
+           <Package>xorg-video-modesetting</Package>
+           <!--for yali -->
+           <Package>busybox-mkinitcpio</Package>
+           <Package>mkinitcpio</Package>
+           <Package>Calamares</Package>
+           <Package>calamares-theme-pisilinux</Package>
+      </Obsoletes>
 </PISI>
@@ -15,7 +15,7 @@ import lzma

 import piksemel

-pisirepouri = "http://ciftlik.pisilinux.org/pisi-2.0/pisi-index.xml.xz"
+pisirepouri = "file:///home/ertugerata/Works/2.0-Beta.1/pisi-index.xml.xz"
 svnrepouri  = "https://github.com/ertugerata/core/raw/master/pisi-index.xml.xz"

 def getIndex(uri):
@@ -35,26 +35,33 @@
    </Package>

    <History>
+        <Update release="4">
+            <Date>2018-07-23</Date>
+            <Version>9</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
        <Update release="3">
+            <Date>2017-02-07</Date>
+            <Version>9</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-04-27</Date>
+            <Version>9</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
            <Date>2015-04-01</Date>
            <Version>9</Version>
-            <Comment>Release bump.</Comment>
+            <Comment>First release</Comment>
            <Name>Marcin Bojara</Name>
            <Email>marcin@pisilinux.org</Email>
        </Update>
-        <Update release="2">
-            <Date>2013-10-29</Date>
-            <Version>9</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="1">
-            <Date>2012-08-23</Date>
-            <Version>9</Version>
-            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
    </History>
 </PISI>
@@ -19,7 +19,15 @@ def builddiet():
    autotools.make("distclean")

    autotools.autoreconf("-fi")
-    autotools.configure('ac_cv_lib_dl_dlopen=no \
+    autotools.configure('--with-thin-check=    \
+                         --with-thin-dump=     \
+                         --with-thin-repair=   \
+                         --with-thin-restore=  \
+                         --with-cache-check=   \
+                         --with-cache-dump=    \
+                         --with-cache-repair=  \
+                         --with-cache-restore= \
+                         ac_cv_lib_dl_dlopen=no \
                         --with-staticdir="/sbin" \
                         --enable-debug \
                         --with-optimisation=\"%s -Os\" \
@@ -36,8 +44,8 @@ def builddiet():
                         --with-systemdsystemunitdir=no \
                         --enable-udev_sync' % get.CFLAGS())

-    pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
-    pisitools.dosed("lib/misc/configure.h","rpl_realloc","realloc")
+    #pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
+    #pisitools.dosed("lib/misc/configure.h","rpl_realloc","realloc")

    autotools.make("-j1 -C include")
    autotools.make("-j1 -C lib LIB_SHARED= VERSIONED_SHLIB=")
@@ -58,7 +66,15 @@ def setup():
    pisitools.dosed("conf/example.conf.in", "use_lvmetad = 0", "use_lvmetad = 1")

    autotools.autoreconf("-fi")
-    autotools.configure("--enable-lvm1_fallback \
+    autotools.configure("--with-thin-check=    \
+                         --with-thin-dump=     \
+                         --with-thin-repair=   \
+                         --with-thin-restore=  \
+                         --with-cache-check=   \
+                         --with-cache-dump=    \
+                         --with-cache-repair=  \
+                         --with-cache-restore= \
+                         --enable-lvm1_fallback \
                         --with-default-pid-dir=/run \
                         --with-default-run-dir=/run/lvm \
                         --with-default-locking-dir=/run/lock/lvm \
@@ -12,16 +12,17 @@
        <IsA>app:console</IsA>
        <Summary>Userland logical volume management tools</Summary>
        <Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
-        <Archive sha1sum="4f45406eb122443a0a9a3f2d338d5203d94d93de" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz</Archive>
+        <Archive sha1sum="35b7358ebefefbf1fceb50bf282c328203248bdb" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.167.tgz</Archive>
        <BuildDependencies>
-            <Dependency releaseFrom="9">libutil-linux-devel</Dependency>
+            <Dependency>libutil-linux-devel</Dependency>
            <Dependency>eudev-devel</Dependency>
+            <Dependency>autoconf-archive</Dependency>
        </BuildDependencies>
        <Patches>
            <!--<Patch level="1">lvm2-2.02.63-always-make-static-libdm.patch</Patch>
            <Patch level="1">lvm2-2.02.92-dynamic-static-ldflags.patch</Patch>
            <Patch level="1">lvm2-2.02.105-pthread-pkgconfig.patch</Patch>
-	  <Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
+            <Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
        </Patches>
    </Source>

@@ -34,6 +35,7 @@
        <Description>Device-mapper includes the driver enables the definition of new block devices composed of ranges of sectors of existing devices to define disk partitions or logical volumes.</Description>
        <Files>
            <Path fileType="executable">/usr/sbin/dmsetup</Path>
+            <Path fileType="executable">/usr/sbin/dmstats</Path>
            <Path fileType="library">/usr/lib/libdevmapper.a</Path>
            <Path fileType="library">/usr/lib/libdevmapper.so*</Path>
            <Path fileType="data">/lib/udev/rules.d/10-dm.rules</Path>
@@ -42,6 +44,7 @@
            <Path fileType="doc">/usr/share/doc/VERSION_DM</Path>
            <Path fileType="doc">/usr/share/doc/WHATS_NEW_DM</Path>
            <Path fileType="man">/usr/share/man/man8/dmsetup.8</Path>
+            <Path fileType="man">/usr/share/man/man8/dmstats.8</Path>
        </Files>
    </Package>

@@ -180,58 +183,39 @@
        <Description>Number of utilities for creating, checking, and repairing logical volumes - statically linked for initramfs.</Description>
        <Files>
            <Path fileType="executable">/sbin/lvm.static</Path>
+            <Path fileType="library">/usr/lib/liblvm2app.a</Path>
+            <Path fileType="library">/usr/lib/liblvm2cmd.a</Path>
        </Files>
    </Package>

    <History>
-        <Update release="7">
-            <Date>2015-05-02</Date>
-            <Version>2.02.118</Version>
+        <Update release="4">
+            <Date>2018-07-23</Date>
+            <Version>2.02.167</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>2.02.167</Version>
            <Comment>Version bump.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="6">
-            <Date>2014-09-04</Date>
-            <Version>2.02.111</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2014-05-09</Date>
-            <Version>2.02.106</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2014-04-07</Date>
-            <Version>2.02.105</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="3">
-            <Date>2013-11-09</Date>
-            <Version>2.02.103</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
        <Update release="2">
-            <Date>2013-07-26</Date>
-            <Version>2.02.98</Version>
-            <Comment>Fix dep, release bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptanan@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>2.02.142</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-14</Date>
-            <Version>2.02.98</Version>
+            <Date>2016-03-13</Date>
+            <Version>2.02.142</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -0,0 +1,77 @@
+diff -Nuar a/crc32c.c b/crc32c.c
+--- a/crc32c.c	2016-01-28 08:14:56.000000000 +0200
+++ b/crc32c.c	2018-10-01 21:34:33.000000000 +0300
+@@ -27,6 +27,7 @@
+  */
+ 
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ #include <asm/types.h>
+ #include <stdlib.h>
+ 
+diff -Nuar a/mdadm.h b/mdadm.h
+--- a/mdadm.h	2016-01-28 08:14:56.000000000 +0200
+++ b/mdadm.h	2018-10-01 21:35:23.000000000 +0300
+@@ -34,6 +34,7 @@
+ #endif
+ 
+ #include	<sys/types.h>
+#include    <sys/sysmacros.h>
+ #include	<sys/stat.h>
+ #include	<stdint.h>
+ #include	<stdlib.h>
+diff -Nuar a/mdmon.c b/mdmon.c
+--- a/mdmon.c	2016-01-28 08:14:56.000000000 +0200
+++ b/mdmon.c	2018-10-01 21:35:42.000000000 +0300
+@@ -46,6 +46,7 @@
+ #include	<unistd.h>
+ #include	<stdlib.h>
+ #include	<sys/types.h>
+#include    <sys/sysmacros.h>
+ #include	<sys/stat.h>
+ #include	<sys/socket.h>
+ #include	<sys/un.h>
+diff -Nuar a/msg.c b/msg.c
+--- a/msg.c	2016-01-28 08:14:56.000000000 +0200
+++ b/msg.c	2018-10-01 21:35:57.000000000 +0300
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include "mdadm.h"
+diff -Nuar a/platform-intel.c b/platform-intel.c
+--- a/platform-intel.c	2016-01-28 08:14:56.000000000 +0200
+++ b/platform-intel.c	2018-10-01 21:36:16.000000000 +0300
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <limits.h>
+ 
+diff -Nuar a/probe_roms.c b/probe_roms.c
+--- a/probe_roms.c	2016-01-28 08:14:56.000000000 +0200
+++ b/probe_roms.c	2018-10-01 21:36:27.000000000 +0300
+@@ -27,6 +27,7 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ #include <asm/types.h>
+ 
+ static void *rom_mem = MAP_FAILED;
+diff -Nuar a/sha1.h b/sha1.h
+--- a/sha1.h	2016-01-28 08:14:56.000000000 +0200
+++ b/sha1.h	2018-10-01 21:36:43.000000000 +0300
+@@ -35,6 +35,7 @@
+ 
+ #ifdef _LIBC
+ # include <sys/types.h>
+#include <sys/sysmacros.h>
+ typedef u_int32_t sha1_uint32;
+ typedef uintptr_t sha1_uintptr;
+ #else
@@ -12,7 +12,13 @@
        <IsA>app:console</IsA>
        <Summary>Utility to control Linux MD devices (software RAID arrays)</Summary>
        <Description>mdadm is used to create, manage, and monitor Linux MD (software RAID) devices.</Description>
-        <Archive sha1sum="c649601d84553501c2f3b452cf93d1fbc53f976a" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.3.2.tar.xz</Archive>
+        <Archive sha1sum="0b6c284970567bfa30dbc14ea5c0e2320582b80c" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.4.tar.xz</Archive>
+        <BuildDependencies>
+            <Dependency>dietlibc</Dependency>
+        </BuildDependencies>
+        <Patches>
+            <Patch level="1">sysmacros.patch</Patch>
+        </Patches>
    </Source>

    <Package>
@@ -52,39 +58,39 @@

    <History>
        <Update release="5">
-            <Date>2015-05-25</Date>
-            <Version>3.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
+            <Date>2018-10-02</Date>
+            <Version>3.4</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="4">
-            <Date>2014-05-17</Date>
-            <Version>3.3</Version>
-            <Comment>Rebuild. Fixed service.py file</Comment>
-            <Name>Aydın Demirel</Name>
-            <Email>aydin.demirel@pisilinux.org</Email>
+            <Date>2018-07-19</Date>
+            <Version>3.4</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="3">
-            <Date>2014-04-13</Date>
-            <Version>3.3</Version>
-            <Comment>mdadm-static is a part of system.base now.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-01-29</Date>
+            <Version>3.4</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2014-01-31</Date>
-            <Version>3.3</Version>
-            <Comment>Ver. bump, rebuild</Comment>
-            <Name>Kamil Atlı</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>3.4</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-14</Date>
-            <Version>3.2.6</Version>
+            <Date>2016-03-13</Date>
+            <Version>3.4</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -0,0 +1,31 @@
+#!/usr/bin/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():
+    #for i in ["mtools.texi"]:
+    #    pisitools.dosed(i, "/usr/local/etc", "/etc")
+
+    shelltools.export("INSTALL_PROGRAM", "install")
+    autotools.autoreconf("-fi")
+    autotools.configure("--prefix=/usr \
+			             --sysconfdir=/etc/mtools \
+                         --includedir=/usr/src/linux/include")
+
+def build():
+    autotools.make()
+    pisitools.dosed("mtools.conf","SAMPLE FILE","#SAMPLE FILE")
+def install():
+    autotools.rawInstall('-j1 DESTDIR="%s"' % get.installDIR())
+    
+
+    pisitools.insinto("/etc/mtools","mtools.conf")
+    
+    pisitools.dodoc("COPYING", "README*", "Release.notes")
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>mtools</Name>
+        <Homepage>http://mtools.linux.lu/</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <Summary>Utilities to access MS-DOS disks without mounting them</Summary>
+        <Description>Mtools are utilities to access MS-DOS disks without mounting them.</Description>
+        <Archive sha1sum="d703db71a409837a37db10a09ef63a35183f7565" type="targz">mirrors://gnu/mtools/mtools-4.0.18.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>mtools</Name>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="config">/etc</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="info">/usr/share/info</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="4">
+            <Date>2018-07-15</Date>
+            <Version>4.0.18</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>4.0.18</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-04-27</Date>
+            <Version>4.0.18</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+	    <Update release="1">
+            <Date>2014-02-12</Date>
+            <Version>4.0.18</Version>
+            <Comment>First release</Comment>
+            <Name>Richard de Bruin</Name>
+            <Email>richdb@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>mtools</Name>
+        <Summary xml:lang="tr">MS-DOS (Windows) disketlerinize -mount ile bağlamadan- erişim araçları</Summary>
+        <Description xml:lang="tr">Mtools diskinizdeki MS-DOS (Windows) bölümlerine -mount komutu ile bağlamadan- erişebilmek için gereken araç setidir.</Description>
+    </Source>
+</PISI>
@@ -17,22 +17,23 @@
        <IsA>data</IsA>
        <Summary>Firmware files used by the Linux kernel</Summary>
        <Description>linux-firmware contains different firmware files required for some devices to operate correctly.</Description>
-        <!-- linux-firmware commit:  commit  f88e5c2e2ff57026ce8028ba4dde8e7325f251a4 2015-09-24 -->
-        <Archive sha1sum="053e48266c07116bf86d0848655e9c0c02076609" type="tarbz2">http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150924.tar.bz2</Archive>
-        <Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/common-fw.tar.xz</Archive>
-        <Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware-ipw.tar.xz</Archive>
-        <Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/firmware-nonfreebox-2-tar.bz2</Archive>
-        <Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ar9170.tar.bz2</Archive>
-        <Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ipw2x00-firmware.tar.bz2</Archive>
-        <Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/aic94xx-seq.tar.bz2</Archive>
-        <Archive sha1sum="9be626663e9b9d15278f2b5cd1c916570eb62727" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/zd12x1-firmware.tar.bz2</Archive>
-        <Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/accessrunner-firmware.tar.bz2</Archive>
-        <Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/rtl8192se-firmware.tar.bz2</Archive>
-        <Archive sha1sum="5d333e75f02a57861565337c14f6944090a242a8" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz</Archive>
+        <!-- linux-firmware commit: 711d3297bac870af42088a467459a0634c1970ca  2019-05-14 -->
+        <Archive sha1sum="4711d2c3125580edf46161694439a2eef4fc0cec" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/linux-firmware-20190514.tar.xz</Archive>
+        <Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/common-fw/common-fw.tar.xz</Archive>
+        <Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/firmware-ipw/firmware-ipw.tar.xz</Archive>
+        <Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/firmware-nonfreebox/firmware-nonfreebox-2-tar.bz2</Archive>
+        <Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/ar9170/ar9170.tar.bz2</Archive>
+        <Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/ipw2x00-firmware/ipw2x00-firmware.tar.bz2</Archive>
+        <Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/aic94xx/aic94xx-seq.tar.bz2</Archive>
+        <Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/accessrunner/accessrunner-firmware.tar.bz2</Archive>
+        <Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/rtl8192se/rtl8192se-firmware.tar.bz2</Archive>
+        <Archive sha1sum="ff9e7f4b120476a90cd3fb69d76240166c4ff2a5" type="tarbz2" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/zd12x1.tar.bz2</Archive>
+        <Archive sha1sum="3239212ae7c5f60baa749764dcb8f5189e1e2f13" type="tarxz" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/nouveau-340-32.tar.xz</Archive>
        <AdditionalFiles>
-            <AdditionalFile target="intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq">fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq</AdditionalFile>
+            <!--AdditionalFile target="intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq">fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq</AdditionalFile-->
            <AdditionalFile target="iwlwifi-7260-14.ucode">iwlwifi-7260-14.ucode</AdditionalFile>
            <AdditionalFile target="iwlwifi-7260-15.ucode">iwlwifi-7260-15.ucode</AdditionalFile>
+            <AdditionalFile target="iwlwifi-7260-17.ucode">iwlwifi-7260-17.ucode</AdditionalFile>
        </AdditionalFiles>
    </Source>

@@ -48,138 +49,61 @@
    </Package>

    <History>
-        <Update release="19">
-            <Date>2015-09-06</Date>
-            <Version>20150924</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="18">
-            <Date>2015-09-06</Date>
-            <Version>20150824</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="17">
-            <Date>2015-07-20</Date>
-            <Version>20150716</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="16">
-            <Date>2015-03-26</Date>
-            <Version>20150320</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="15">
-            <Date>2015-02-14</Date>
-            <Version>20150214</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>     
-        <Update release="14">
-            <Date>2014-12-16</Date>
-            <Version>20141216</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="13">
-            <Date>2014-11-07</Date>
-            <Version>20141107</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="12">
-            <Date>2014-07-23</Date>
-            <Version>20140603</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin.bojara@pisilinux.org</Email>
-        </Update>
-        <Update release="11">
-            <Date>2014-04-02</Date>
-            <Version>20140316</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2014-03-01</Date>
-            <Version>20140217</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-         <Update release="9">
-            <Date>2013-11-30</Date>
-            <Version>20131013</Version>
-            <Comment>Remove unneeded build dep,fix unpack problem.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
        <Update release="8">
-            <Date>2013-11-23</Date>
-            <Version>20131013</Version>
-            <Comment>Version bump to 20131013 git.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2019-06-05</Date>
+            <Version>20190514</Version>
+            <Comment>Update</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="7">
-            <Date>2013-09-30</Date>
-            <Version>20130811</Version>
-            <Comment>add update Intel-Bluetooth patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2018-07-29</Date>
+            <Version>20180722</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="6">
-            <Date>2013-08-11</Date>
-            <Version>20130811</Version>
-            <Comment>add update patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2018-07-15</Date>
+            <Version>20171123</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="5">
-            <Date>2013-07-19</Date>
-            <Version>20130609</Version>
-            <Comment>add update patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2013-06-09</Date>
-            <Version>20130609</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+         <Update release="5">
+            <Date>2017-11-23</Date>
+            <Version>20171123</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+         </Update>
+         <Update release="4">
+            <Date>2017-02-11</Date>
+            <Version>20170113</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-04-07</Date>
-            <Version>20130421</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-06-29</Date>
+            <Version>20160624</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-03-07</Date>
-            <Version>20130224</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>20160111</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-12-12</Date>
-            <Version>20121212</Version>
+            <Date>2016-01-22</Date>
+            <Version>20160111</Version>
            <Comment>First release</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
    </History>
 </PISI>
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2019 TUBITAK/UEKAE
+# Licensed under the GNU General Public License, version 2.
+# See the file http://www.gnu.org/copyleft/gpl.txt.
+
+from pisi.actionsapi import pisitools
+
+def install():
+    pisitools.insinto("/usr/lib/crda/", "regulatory.bin")
+    pisitools.insinto("/lib/firmware", "regulatory.db*")
+    pisitools.insinto("/etc/wireless-regdb/pubkeys", "sforshee.key.pub.pem")
+    
+    pisitools.doman("regulatory.db.5")
+
+    pisitools.dodoc("LICENSE", "README", "CONTRIBUTING")
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>wireless-regdb</Name>
+        <Homepage>https://wireless.wiki.kernel.org/en/developers/Regulatory</Homepage>
+        <Packager>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Packager>
+        <License>ISC</License>
+        <Icon>wireless-regdb</Icon>
+        <IsA>app:console</IsA>
+        <Summary>This package contains the wireless regulatory database used by all cfg80211 based Linux wireless drivers</Summary>
+        <Description>This package contains the wireless regulatory database used by all cfg80211 based Linux wireless drivers</Description>
+        <Archive sha1sum="a4a541f4ef81985e919b15477253f16df997e8d9" type="tarxz">https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2018.10.24.tar.xz</Archive>
+    </Source>
+
+    <Package>
+        <Name>wireless-regdb</Name>
+        <Files>
+            <Path fileType="conf">/etc/wireless-regdb</Path>
+            <Path fileType="data">/usr/lib/crda</Path>
+            <Path fileType="data">/lib/firmware</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2019-01-15</Date>
+            <Version>2018.10.24</Version>
+            <Comment>First release</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>
@@ -0,0 +1,74 @@
+'''
+Created on 24-12-2012
+
+@author: marcin
+'''
+import os
+import re
+
+rootpath = "."
+specfile = "pspec.xml"
+newcomment = "First release"
+newrelease = "1"
+relative_backup_path = "../backup"
+
+def read_file(path):
+    with open(path) as f:
+        return f.read().strip()
+
+def reset_history(spec):
+    release = re.compile("(.*?release\s*=\s*)[\"\']\d+[\"\'](.*?)")
+    newspec = ''
+    history = False
+    update1 = False
+    skipline = False
+    for line in spec.split("\n"):
+        if "</History>" in line: history = False
+        if "<History>" in line: history = True
+        if history:
+            if "</Update>" in line:
+                if not update1: newspec = "\n".join((newspec, line))
+                update1 = True
+            if update1: continue
+            else:
+                if "<Update" in line: line = re.sub(release, r'\1"%s"\2' % newrelease, line)
+                elif "<Comment" in line:
+                    if not "</Comment" in line:
+                        skipline = True
+                if "</Comment" in line:
+                    skipline = False
+                    line = " " * 12 + "<Comment>%s</Comment>" % newcomment
+                if not skipline: newspec = "\n".join((newspec, line))
+        else: newspec = "\n".join((newspec, line))
+    return newspec
+
+if __name__ == '__main__':
+    backup_path = os.path.normpath(os.path.join(rootpath, relative_backup_path))
+    if not os.path.isdir(backup_path):
+        os.makedirs(backup_path)
+    else:
+        suffix = 0
+        parent_backup = os.path.dirname(backup_path)
+        base_name = os.path.basename(relative_backup_path)
+        for d in os.listdir(parent_backup):
+            if d.startswith(base_name):
+                ext = d.replace(base_name, '')
+                if os.path.isdir("%s/%s" % (parent_backup, d)) and ext.isdigit():
+                    if int(ext) > suffix:
+                        suffix = int(ext)
+        suffix +=1
+        suffix = "0%d" % suffix if suffix < 10 else str(suffix)
+        os.rename(backup_path, backup_path + suffix)
+        os.makedirs(backup_path)
+ 
+    for root, dirs, files in os.walk(rootpath):
+        if specfile in files:
+            f = "%s/%s" % (root, specfile)
+            print(f)
+            spec = read_file(f)
+            bf = "%s/%s" % (os.path.normpath(root.replace(rootpath, relative_backup_path)), specfile)
+            os.makedirs(os.path.dirname(bf))
+            open(bf, "w").write(spec)
+            open(bf, "a").write("\n")
+            open(f, "w").write(reset_history(spec))
+            open(f, "a").write("\n")
@@ -1,17 +1,19 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
    <Source>
        <Name>module-bbswitch</Name>
        <Homepage>https://github.com/Bumblebee-Project/bbswitch</Homepage>
        <Packager>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Packager>
        <License>GPL</License>
        <IsA>app:gui</IsA>
        <Summary>Kernel module allowing to switch dedicated graphics card on Optimus laptops</Summary>
        <Description>kernel module allowing to switch dedicated graphics card on Optimus laptops</Description>
        <BuildDependencies>
-            <Dependency version="4.2.5">kernel-module-headers</Dependency>
+            <Dependency version="4.19.56">kernel-module-headers</Dependency>
        </BuildDependencies>
        <Archive sha1sum="e282ee682d794e3962baa4dead01917c42571e78" type="targz">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
        <Patches>
@@ -20,7 +22,7 @@
    <Package>
        <Name>module-bbswitch</Name>
        <RuntimeDependencies>
-            <Dependency version="4.2.5">kernel</Dependency>
+            <Dependency version="4.19.56">kernel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -34,243 +36,187 @@
    </Package>

    <History>
-        <Update release="33">
-            <Date>2015-11-30</Date>
+        <Update release="26">
+            <Date>2019-06-26</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.2.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="32">
-            <Date>2015-11-27</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.2.4.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="31">
-            <Date>2015-10-05</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.2.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>        
-        <Update release="30">
-            <Date>2015-10-01</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Comment>Rebuild.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="29">
-            <Date>2015-09-23</Date>
+        <Update release="25">
+            <Date>2019-05-11</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Comment>Rebuild.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="28">
-            <Date>2015-09-18</Date>
+        <Update release="24">
+            <Date>2019-04-06</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-           <Update release="27">
-            <Date>2015-08-18</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="26">
-            <Date>2015-08-13</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="25">
-            <Date>2015-07-23</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="24">
-            <Date>2015-07-20</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="23">
-            <Date>2015-07-13</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
+            <Comment>Rebuild.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="22">
-            <Date>2015-06-30</Date>
+        <Update release="23">
+            <Date>2019-01-20</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-          <Update release="21">
-            <Date>2015-06-24</Date>
+        <Update release="22">
+            <Date>2018-12-22</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="20">
-            <Date>2015-06-16</Date>
+        <Update release="21">
+            <Date>2018-10-05</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for new kernel</Comment>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-       <Update release="19">
-            <Date>2015-05-22</Date>
+        <Update release="20">
+            <Date>2018-07-07</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-       <Update release="18">
-            <Date>2015-05-05</Date>
+        <Update release="19">
+            <Date>2018-07-15</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-       <Update release="17">
-            <Date>2015-04-24</Date>
+        <Update release="18">
+            <Date>2018-07-12</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
+            <Comment>Version bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="16">
-            <Date>2015-04-16</Date>
+        <Update release="17">
+            <Date>2018-04-28</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
+            <Comment>Version bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
+        <Update release="16">
+            <Date>2018-03-11</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
        <Update release="15">
-            <Date>2015-04-02</Date>
+            <Date>2018-03-03</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
-         <Update release="14">
-            <Date>2015-03-08</Date>
+        <Update release="14">
+            <Date>2018-01-06</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
-         <Update release="13">
-            <Date>2015-03-01</Date>
+        <Update release="13">
+            <Date>2017-12-20</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2015-01-28</Date>
+            <Date>2017-12-04</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2015-01-09</Date>
+            <Date>2017-11-19</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.18.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="10">
-            <Date>2014-11-29</Date>
+            <Date>2017-08-21</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="9">
-            <Date>2014-10-18</Date>
+            <Date>2017-07-04</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.17.1</Comment>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>Kamil Atlı</Name>
            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2014-09-19</Date>
+            <Date>2017-02-01</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="7">
-            <Date>2014-09-03</Date>
+            <Date>2016-12-10</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="6">
-            <Date>2014-07-24</Date>
+            <Date>2016-11-02</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2014-06-15</Date>
+            <Date>2016-08-24</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2014-05-29</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="4">
-            <Date>2014-05-02</Date>
+            <Date>2016-08-06</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="3">
-            <Date>2014-04-15</Date>
+            <Date>2016-06-28</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2014-03-29</Date>
+            <Date>2016-04-30</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.13.6.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2014-03-09</Date>
+            <Date>2016-03-07</Date>
            <Version>0.8</Version>
-            <Comment>First release.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Comment>First release</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -20,4 +20,4 @@ def build():
 def install():
    pisitools.insinto("/lib/modules/%s/extra" % KDIR, "wl.ko")

-    pisitools.dodoc("lib/LICENSE.txt")
+    pisitools.dodoc("lib/LICENSE.txt")
@@ -1,6 +1,5 @@
-blacklist brcm80211
 blacklist b43
 blacklist ssb
 blacklist bcma
 blacklist brcmsmac
-blacklist brcmfmac
+blacklist brcmfmac
@@ -0,0 +1,52 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index a9671e2..da36405 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -30,6 +30,9 @@
+ #include <linux/kthread.h>
+ #include <linux/netdevice.h>
+ #include <linux/ieee80211.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#include <linux/sched/signal.h>
+#endif
+ #include <net/cfg80211.h>
+ #include <linux/nl80211.h>
+ #include <net/rtnetlink.h>
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 489c9f5..f8278ad 100644
+--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
+@@ -117,6 +117,9 @@ int wl_found = 0;
+ 
+ typedef struct priv_link {
+ 	wl_if_t *wlif;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	unsigned long last_rx;
+#endif
+ } priv_link_t;
+ 
+ #define WL_DEV_IF(dev)          ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif)
+@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ {
+ 	struct sk_buff *oskb = (struct sk_buff *)p;
+ 	struct sk_buff *skb;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	priv_link_t *priv_link;
+#endif
+ 	uchar *pdata;
+ 	uint len;
+ 
+@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ 	if (skb == NULL) return;
+ 
+ 	skb->dev = wl->monitor_dev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	priv_link = MALLOC(wl->osh, sizeof(priv_link_t));
+	priv_link = netdev_priv(skb->dev);
+	priv_link->last_rx = jiffies;
+#else
+ 	skb->dev->last_rx = jiffies;
+#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ 	skb_reset_mac_header(skb);
+ #else
@@ -0,0 +1,64 @@
+diff -ru work.orig/src/wl/sys/wl_cfg80211_hybrid.c work.patched/src/wl/sys/wl_cfg80211_hybrid.c
+--- work.orig/src/wl/sys/wl_cfg80211_hybrid.c	2017-06-10 15:50:27.328823384 -0700
+++ work.patched/src/wl/sys/wl_cfg80211_hybrid.c	2017-06-10 15:52:40.540809187 -0700
+@@ -52,8 +52,13 @@
+ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+           enum nl80211_iftype type, struct vif_params *params);
+#else
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
+#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ static s32
+ wl_cfg80211_scan(struct wiphy *wiphy,
+@@ -466,7 +471,11 @@
+ 
+ static s32
+ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+                         enum nl80211_iftype type,
+#else
+                          enum nl80211_iftype type, u32 *flags,
+#endif
+    struct vif_params *params)
+ {
+ 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+@@ -2361,12 +2370,26 @@
+                     const wl_event_msg_t *e, void *data)
+ {
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+	struct cfg80211_roam_info roam_info = {};
+#endif
+ 	s32 err = 0;
+ 
+ 	wl_get_assoc_ies(wl);
+ 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	wl_update_bss_info(wl);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+	roam_info.channel = &wl->conf->channel,
+	roam_info.bssid = (u8 *)&wl->bssid,
+	roam_info.req_ie = conn_info->req_ie,
+	roam_info.req_ie_len = conn_info->req_ie_len,
+	roam_info.resp_ie = conn_info->resp_ie,
+	roam_info.resp_ie_len = conn_info->resp_ie_len,
+
+	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
+#else
+ 	cfg80211_roamed(ndev,
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
+@@ -2374,6 +2397,7 @@
+ 			(u8 *)&wl->bssid,
+ 			conn_info->req_ie, conn_info->req_ie_len,
+ 			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
+#endif
+ 	WL_DBG(("Report roaming result\n"));
+ 
+ 	set_bit(WL_STATUS_CONNECTED, &wl->status);
@@ -0,0 +1,63 @@
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 489c9f5..f8278ad 100644
+--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
+@@ -93,7 +93,11 @@
+ 
+ #include <wlc_wowl.h>
+ 
+#ifdef HAVE_TIMER_SETUP
+static void wl_timer(struct timer_list *list);
+#else
+ static void wl_timer(ulong data);
+#endif
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+ 
+@@ -2296,12 +2300,17 @@
+ 
+ 	atomic_dec(&t->wl->callbacks);
+ }
+-
+#ifdef HAVE_TIMER_SETUP
+static void
+wl_timer(struct timer_list *list)
+{
+	wl_timer_t *t = from_timer(t,list,timer);
+#else
+ static void
+ wl_timer(ulong data)
+ {
+ 	wl_timer_t *t = (wl_timer_t *)data;
+-
+#endif
+ 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ 		_wl_timer(t);
+ 	else
+@@ -2351,10 +2360,13 @@
+ 	}
+ 
+ 	bzero(t, sizeof(wl_timer_t));
+-
+#ifdef HAVE_TIMER_SETUP
+	timer_setup(&t->timer, wl_timer,0);
+#else
+ 	init_timer(&t->timer);
+ 	t->timer.data = (ulong) t;
+ 	t->timer.function = wl_timer;
+#endif
+ 	t->wl = wl;
+ 	t->fn = fn;
+ 	t->arg = arg;
+diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
+index 489c9f5..f8278ad 100644
+--- a/src/wl/sys/wl_linux.h
+++ b/src/wl/sys/wl_linux.h
+@@ -190,3 +190,7 @@
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+ 
+ #endif 
+
+#if defined(timer_setup) && defined(from_timer)
+#define HAVE_TIMER_SETUP
+#endif
@@ -1,29 +0,0 @@
-From b14ac6e4b871b5e15f63389ba63d1fc23a54c58b Mon Sep 17 00:00:00 2001
-From: Tim Gardner <tim.gardner@canonical.com>
-Date: Tue, 4 Aug 2015 09:02:10 -0600
-Subject: [PATCH] cfg80211_disconnected
-
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
- bcmwl-6.30.223.248+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index ea0726f..0131f01 100644
--- a/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
- 		}
- 		else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) ||
- 			event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- 			cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
-+#else
-+			cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL);
-+#endif
- 			clear_bit(WL_STATUS_CONNECTED, &wl->status);
- 			wl_link_down(wl);
- 			wl_init_prof(wl->profile);
-- 
-2.5.0
-
@@ -1,27 +0,0 @@
-Description: Fixing null pointer crash
-
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
-Bug-Ubuntu: https://launchpad.net/bugs/1415880
-Last-Update: 2015-08-18
-
---
- src/wl/sys/wl_linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
-index 860b935..295156f 100644
--- a/src/wl/sys/wl_linux.c
-+++ b/src/wl/sys/wl_linux.c
-@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
- 	wlif = WL_DEV_IF(dev);
- 	wl = WL_INFO(dev);
- 
-+	skb->prev = NULL;
- 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
-		skb->prev = NULL;
- 
- 		TXQ_LOCK(wl);
- 
-- 
-1.9.1
-
@@ -1,12 +0,0 @@
-diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c	2015-01-06 12:33:42.981659618 +0100
-+++ b/src/wl/sys/wl_linux.c	2015-01-06 12:34:05.647395418 +0100
-@@ -2157,8 +2157,8 @@
- 	wlif = WL_DEV_IF(dev);
- 	wl = WL_INFO(dev);
- 
-+	skb->prev = NULL;
- 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
-		skb->prev = NULL;
- 
- 		TXQ_LOCK(wl);
@@ -1,11 +0,0 @@
--- a/Makefile	2014-06-26 10:42:08.000000000 +0000
-+++ b/Makefile	2014-07-17 22:44:01.662297228 +0000
-@@ -126,6 +126,8 @@
- EXTRA_CFLAGS       += -I$(src)/src/shared/bcmwifi/include
- #EXTRA_CFLAGS       += -DBCMDBG_ASSERT -DBCMDBG_ERR
- 
-+EXTRA_CFLAGS       += -Wno-date-time
-+
- EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
- 
- KBASE              ?= /lib/modules/`uname -r`
@@ -1,26 +0,0 @@
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:29.899350026 +0100
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:06.732682365 +0100
-@@ -1452,7 +1452,11 @@
- 		WL_DBG(("Could not get rate (%d)\n", err));
- 	} else {
- 		rate = dtoh32(rate);
-+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-+		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
-+		#else
- 		sinfo->filled |= STATION_INFO_TX_BITRATE;
-+		#endif
- 		sinfo->txrate.legacy = rate * 5;
- 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
- 	}
-@@ -1465,7 +1469,11 @@
- 			return err;
- 		}
- 		rssi = dtoh32(scb_val.val);
-+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-+		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
-+		#else
- 		sinfo->filled |= STATION_INFO_SIGNAL;
-+		#endif
- 		sinfo->signal = rssi;
- 		WL_DBG(("RSSI %d dBm\n", rssi));
- 	}
@@ -1,60 +0,0 @@
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-26 12:42:08.000000000 +0200
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-10-08 18:47:07.549476082 +0200
-@@ -2071,7 +2071,22 @@
- 			wl_get_assoc_ies(wl);
- 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
- 			wl_update_bss_info(wl);
-			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
-+			{
-+				struct wl_bss_info *bi;
-+				u16 bss_info_channel;
-+				struct ieee80211_channel *channel;
-+				u32 freq;
-+
-+				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
-+				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
-+
-+				freq = ieee80211_channel_to_frequency(bss_info_channel,
-+				       (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
-+				       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
-+
-+				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
-+				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
-+			}
- 			set_bit(WL_STATUS_CONNECTED, &wl->status);
- 			wl->profile->active = true;
- 		}
--- a/src/wl/sys/wl_linux.c	2014-06-26 12:42:08.000000000 +0200
-+++ b/src/wl/sys/wl_linux.c	2014-10-08 18:47:19.526693719 +0200
-@@ -878,7 +878,7 @@
- static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
- #endif
- 
-static struct pci_driver wl_pci_driver = {
-+static struct pci_driver wl_pci_driver __refdata = {
- 	.name =		"wl",
- 	.probe =	wl_pci_probe,
- 	.remove =	__devexit_p(wl_remove),
-@@ -1307,7 +1307,12 @@
- 	dev->priv = priv_link;
- #else
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
- 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
-+#else
-+	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
-+			   ether_setup);
-+#endif
- 	if (!dev) {
- 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
- 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-12-10 03:43:11.145810000 +0000
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-12-10 03:44:37.700680960 +0000
-@@ -2010,7 +2010,7 @@
- 
- 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
- 	notify_ielen = le32_to_cpu(bi->ie_length);
-	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
-+	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
- 		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
- 		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
@@ -0,0 +1,109 @@
+Since Linux 4.7, the enum ieee80211_band is no longer used
+
+This shall cause no problem's since both enums ieee80211_band
+and nl80211_band were added in the same commit:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
+
+This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
+
+Reference:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:57:36.159340297 -0500
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:58:18.442323435 -0500
+@@ -236,7 +236,7 @@
+ #endif				
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
+	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -245,7 +245,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
+	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -379,7 +379,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_2ghz = {
+-	.band = IEEE80211_BAND_2GHZ,
+	.band = NL80211_BAND_2GHZ,
+ 	.channels = __wl_2ghz_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
+ 	.bitrates = wl_g_rates,
+@@ -387,7 +387,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_a = {
+-	.band = IEEE80211_BAND_5GHZ,
+	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_a_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
+ 	.bitrates = wl_a_rates,
+@@ -395,7 +395,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_n = {
+-	.band = IEEE80211_BAND_5GHZ,
+	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_n_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
+ 	.bitrates = wl_a_rates,
+@@ -1876,8 +1876,8 @@
+ 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+ 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+-	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
+-	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
+	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+ 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
+ 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -2000,7 +2000,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+ 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
+-		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
+ #else
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+ #endif
+@@ -2116,7 +2116,7 @@
+ 				return err;
+ 			}
+ 			chan = wf_chspec_ctlchan(chanspec);
+-			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+ 			freq = ieee80211_channel_to_frequency(chan, band);
+ 			channel = ieee80211_get_channel(wiphy, freq);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+@@ -2250,10 +2250,10 @@
+ 		join_params->params.chanspec_list[0] =
+ 		    ieee80211_frequency_to_channel(chan->center_freq);
+ 
+-		if (chan->band == IEEE80211_BAND_2GHZ) {
+		if (chan->band == NL80211_BAND_2GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_2G;
+ 		}
+-		else if (chan->band == IEEE80211_BAND_5GHZ) {
+		else if (chan->band == NL80211_BAND_5GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_5G;
+ 		}
+ 		else {
+@@ -2885,7 +2885,7 @@
+ 
+ 	if (phy == 'n' || phy == 'a' || phy == 'v') {
+ 		wiphy = wl_to_wiphy(wl);
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+ 	}
+ 
+ 	return err;
@@ -0,0 +1,52 @@
+Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:53:55.588036464 +0200
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:54:11.911695944 +0200
+@@ -2386,8 +2386,15 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = true
+		};
+ 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
+-		cfg80211_scan_done(wl->scan_request, true);     
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+		cfg80211_scan_done(wl->scan_request, true);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+@@ -2488,7 +2495,14 @@
+ 
+ scan_done_out:
+ 	if (wl->scan_request) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = false
+		};
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+ 		cfg80211_scan_done(wl->scan_request, false);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 	rtnl_unlock();
+@@ -2913,7 +2927,14 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
+-		cfg80211_scan_done(wl->scan_request, true);	
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = true
+		};
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+		cfg80211_scan_done(wl->scan_request, true);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
@@ -0,0 +1,14 @@
+diff --git a/src/wl/sys/wl_linux.c.orig b/src/wl/sys/wl_linux.c
+index eb00717..489c9f5 100644
+--- a/src/wl/sys/wl_linux.c.orig
+++ b/src/wl/sys/wl_linux.c
+@@ -2166,8 +2166,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
+	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
@@ -1,11 +0,0 @@
-diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c	2013-08-01 09:52:22.000000000 +0300
-+++ b/src/wl/sys/wl_linux.c	2013-09-27 09:20:11.495023471 +0300
-@@ -235,7 +235,7 @@
- #define to_str(s) #s
- #define quote_str(s) to_str(s)
- 
-#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- 
- static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); 
@@ -5,39 +5,35 @@
        <Name>module-broadcom-wl</Name>
        <Homepage>http://www.broadcom.com/support/802.11/linux_sta.php</Homepage>
        <Packager>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Packager>
        <License>freedist</License>
        <IsA>driver</IsA>
        <Summary>Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware</Summary>
        <Description>This package contains Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware. You must read the LICENSE.txt file in the docs directory before using this software.</Description>
-        <Archive sha1sum="e02beac9cc713011551c483ae5f20f065f5b88c7" type="targz" target="i686">http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
-        <Archive sha1sum="bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c" type="targz" target="x86_64">http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
+        <Archive sha1sum="8acbdbb4ab4ab4123d1773b616904798fbef9277" type="targz" target="i686">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
+        <Archive sha1sum="1f568bb989d175813c5631c6629d9479eae6f3be" type="targz" target="x86_64">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
        <BuildDependencies>
-            <Dependency version="4.2.5">kernel-module-headers</Dependency>
+            <Dependency version="4.19.56">kernel-module-headers</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch level="1">patch/linux-40.patch</Patch>
-            <Patch level="1">patch/linux-recent.patch</Patch>
            <Patch level="1">patch/license.patch</Patch>
-            <Patch level="1">patch/gcc.patch</Patch>
-            <Patch level="1">patch/wlan.patch</Patch>
-            <Patch level="1">patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch</Patch>
-            <Patch>patch/0018-cfg80211_disconnected.patch</Patch>
-            <!--Patch>patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch</Patch-->
+            <Patch level="1">patch/wl_linux.c.patch</Patch>
+            <Patch level="1">patch/linux47.patch</Patch>
+            <Patch level="1">patch/linux48.patch</Patch>
+            <Patch level="1">linux-4.11.patch</Patch>
+            <Patch level="1">linux-4.12.patch</Patch>
+            <Patch level="1">linux-4.15.patch</Patch>
        </Patches>
    </Source>

    <Package>
        <Name>module-broadcom-wl</Name>
        <RuntimeDependencies>
-            <Dependency version="4.2.5">kernel</Dependency>
+            <Dependency version="4.19.56">kernel</Dependency>
            <Dependency release="current">module-broadcom-wl-userspace</Dependency>
        </RuntimeDependencies>
-        <Replaces>
-            <Package>broadcom-wl</Package>
-        </Replaces>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
        </Files>
@@ -64,376 +60,180 @@
    </Package>

    <History>
-        <Update release="53">
-            <Date>2015-11-30</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.2.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="52">
-            <Date>2015-11-27</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.2.4.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="51">
-            <Date>2015-10-05</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.2.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>        
-        <Update release="50">
-            <Date>2015-10-01</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.2.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="49">
-            <Date>2015-09-23</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="48">
-            <Date>2015-09-18</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="47">
-            <Date>2015-08-18</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="46">
-            <Date>2015-08-13</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="45">
-            <Date>2015-07-23</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="44">
-            <Date>2015-07-20</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="43">
-            <Date>2015-07-13</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="42">
-            <Date>2015-06-30</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="41">
-            <Date>2015-06-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="40">
-            <Date>2015-06-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="38">
-            <Date>2015-05-22</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="37">
-            <Date>2015-05-05</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="36">
-            <Date>2015-04-24</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="35">
-            <Date>2015-04-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="34">
-            <Date>2015-04-02</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="33">
-            <Date>2015-03-08</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="32">
-            <Date>2015-03-01</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="31">
-            <Date>2015-02-28</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="30">
-            <Date>2014-11-29</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="29">
-            <Date>2014-10-19</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.17.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="28">
-            <Date>2014-09-19</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="27">
-            <Date>2014-09-03</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="26">
-            <Date>2014-07-23</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
-        </Update>
        <Update release="25">
-            <Date>2014-06-15</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2019-06-26</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="24">
-            <Date>2014-05-29</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2019-05-11</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="23">
-            <Date>2014-05-02</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2019-01-20</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="22">
-            <Date>2014-04-15</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-12-22</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="21">
-            <Date>2014-03-29</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-10-05</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="20">
-            <Date>2014-03-01</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-08-07</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="19">
-            <Date>2014-01-17</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
+        <Update release="19">
+            <Date>2018-07-15</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-07-12</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="17">
-            <Date>2013-12-14</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-28</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-03-11</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="15">
-            <Date>2013-11-05</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-03-03</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="14">
-            <Date>2013-10-09</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2018-01-06</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="13">
-            <Date>2013-09-28</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-12-20</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2013-09-18</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-12-04</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2013-09-05</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-11-19</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="10">
-            <Date>2013-08-30</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-08-21</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.x</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-07-04</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2013-08-11</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>without blacklist</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for kernel 4.9.6.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="7">
-            <Date>2013-07-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for Kernel 3.10.x</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-01-08</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Fix url and add patch.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-15</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>rebuild for Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="5">
-            <Date>2013-05-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>rebuild for Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Kernel 3.9.3</Comment>
+            <Date>2016-08-24</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-02-07</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Runtime dep</Comment>
-            <Name>Ertan Güven</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-02-01</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>bump+fix for new kernel-line</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-05-23</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2011-09-15</Date>
-            <Version>5.100.82.38</Version>
+            <Date>2016-03-07</Date>
+            <Version>6.30.223.248</Version>
            <Comment>First release</Comment>
-            <Name>Pisi Linux Admins</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -11,6 +11,7 @@ KDIR = kerneltools.getKernelVersion()

 def build():
    autotools.make("KERN_DIR=/lib/modules/%s/build" % KDIR)
+    #autotools.make("-C vboxsf KERN_DIR=/lib/modules/%s/build" % KDIR)
    autotools.make("-C vboxvideo KERN_DIR=/lib/modules/%s/build" % KDIR)

 def install():
@@ -0,0 +1,39 @@
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile	2018-10-15 17:25:07.000000000 +0300
+++ b/Makefile	2018-08-14 14:38:32.000000000 +0300
+@@ -25,7 +25,7 @@
+ 
+ KBUILD_VERBOSE =
+ 
+-vboxguest:
+all:
+ 	@echo "=== Building 'vboxguest' module ==="
+ 	@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
+ 	@if [ -f vboxguest/vboxguest.ko ]; then \
+@@ -34,8 +34,6 @@
+ 	    cp vboxguest/vboxguest.o .; \
+ 	 fi
+ 	@echo
+-
+-vboxsf: vboxguest
+ 	@if [ -d vboxsf ]; then \
+ 	    if [ -f vboxguest/Module.symvers ]; then \
+ 	        cp vboxguest/Module.symvers vboxsf; \
+@@ -49,8 +47,6 @@
+ 	    fi; \
+ 	    echo; \
+ 	fi
+-
+-vboxvideo:
+ 	@if [ -d vboxvideo ]; then \
+ 	    if [ -f vboxguest/Module.symvers ]; then \
+ 	        cp vboxguest/Module.symvers vboxvideo; \
+@@ -65,8 +61,6 @@
+ 	    echo; \
+ 	fi
+ 
+-all: vboxguest vboxsf vboxvideo
+-
+ install:
+ 	@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
+ 	@if [ -d vboxsf ]; then \
@@ -3,7 +3,7 @@
 <PISI>
    <Source>
        <Name>module-virtualbox-guest</Name>
-        <Homepage>http://www.virtualbox.org</Homepage>
+        <Homepage>https://www.virtualbox.org</Homepage>
        <Packager>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
@@ -12,16 +12,19 @@
        <IsA>driver</IsA>
        <Summary>Kernel modules for VirtualBox guest machines</Summary>
        <Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
-        <Archive sha1sum="cd1f7c62e17ef3d9b5f7aef7d83fd160355eb396" type="tarxz">http://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.0.4.tar.xz</Archive>
+        <Archive sha1sum="474ced834f7ce95ae9db5fec8a924f9285077bc3" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-6.0.12.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency version="4.2.5">kernel-module-headers</Dependency>
+            <Dependency version="4.19.56">kernel-module-headers</Dependency>
        </BuildDependencies>
+        <Patches>
+<!--             <Patch>vboxsf-make.patch</Patch> -->
+        </Patches>
    </Source>

    <Package>
        <Name>module-virtualbox-guest</Name>
        <RuntimeDependencies>
-            <Dependency version="4.2.5">kernel</Dependency>
+            <Dependency version="4.19.56">kernel</Dependency>
            <Dependency>baselayout</Dependency>
            <Dependency version="current">module-virtualbox-guest-userspace</Dependency>
        </RuntimeDependencies>
@@ -52,390 +55,320 @@
    </Package>

    <History>
-        <Update release="54">
-            <Date>2015-11-30</Date>
-            <Version>5.0.4</Version>
-            <Comment>Rebuild for kernel-4.2.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="53">
-            <Date>2015-11-27</Date>
-            <Version>5.0.4</Version>
+        <Update release="45">
+            <Date>2019-09-29</Date>
+            <Version>6.0.12</Version>
            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="52">
-            <Date>2015-10-05</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.2.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="51">
-            <Date>2015-10-01</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.2.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="50">
-            <Date>2015-08-23</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="49">
-            <Date>2015-08-18</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update> 
-        <Update release="48">
-            <Date>2015-08-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>       
-        <Update release="47">
-            <Date>2015-07-23</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>      
-        <Update release="46">
-            <Date>2015-07-20</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="45">
-            <Date>2015-07-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="45">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="44">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="43">
-            <Date>2015-06-09</Date>
-            <Version>4.3.28</Version>
+            <Date>2019-08-04</Date>
+            <Version>6.0.10</Version>
            <Comment>Version Bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="42">
-            <Date>2015-05-14</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="41">
-            <Date>2015-05-05</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="43">
+            <Date>2019-06-26</Date>
+            <Version>6.0.8</Version>
+            <Comment>Rebuild drivers</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="40">
-            <Date>2015-04-24</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
+        <Update release="42">
+            <Date>2019-05-17</Date>
+            <Version>6.0.8</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="41">
+            <Date>2019-05-11</Date>
+            <Version>6.0.6</Version>
+            <Comment>Rebuild drivers</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-         <Update release="39">
-            <Date>2015-04-16</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+        <Update release="40">
+            <Date>2019-04-20</Date>
+            <Version>6.0.6</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
-	<Update release="38">
-            <Date>2015-04-02</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
+        <Update release="39">
+            <Date>2019-04-06</Date>
+            <Version>6.0.4</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="38">
+            <Date>2019-01-29</Date>
+            <Version>6.0.4</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="37">
-            <Date>2015-03-08</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
+            <Date>2019-01-20</Date>
+            <Version>6.0.2</Version>
+            <Comment>Version Bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="36">
-            <Date>2015-03-01</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Date>2019-01-16</Date>
+            <Version>6.0.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="35">
-            <Date>2015-01-28</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
+            <Date>2018-12-22</Date>
+            <Version>6.0.0</Version>
+            <Comment>Version Bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="34">
-            <Date>2015-01-09</Date>
-            <Version>4.3.20</Version>
-            <Comment>Version bump, kernel 3.18.1</Comment>
+            <Date>2018-11-23</Date>
+            <Version>5.2.22</Version>
+            <Comment>Rebuild</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="33">
-            <Date>2014-11-29</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-10-05</Date>
+            <Version>5.2.18</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="32">
-            <Date>2014-10-19</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, kernel 3.17.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-09-16</Date>
+            <Version>5.2.18</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="31">
-            <Date>2014-09-19</Date>
-            <Version>4.3.16</Version>
-            <Comment>Version bump, kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-08-17</Date>
+            <Version>5.2.16</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="30">
-            <Date>2014-09-03</Date>
-            <Version>4.3.14</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-08-06</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="29">
-            <Date>2014-07-24</Date>
-            <Version>4.3.14</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedatn@pisilinux.org</Email>
+            <Date>2018-07-15</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="28">
-            <Date>2014-06-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-07-12</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="27">
-            <Date>2014-05-29</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-05-10</Date>
+            <Version>5.2.12</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="26">
-            <Date>2014-05-02</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-28</Date>
+            <Version>5.2.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="25">
-            <Date>2014-04-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-18</Date>
+            <Version>5.2.10</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="24">
-            <Date>2014-04-07</Date>
-            <Version>4.3.10</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2018-03-15</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="23">
-            <Date>2014-03-29</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-03-11</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="22">
-            <Date>2014-03-09</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-03-03</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="21">
-            <Date>2014-03-01</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-01-06</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="20">
-            <Date>2014-01-17</Date>
-            <Version>4.3.6</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
+            <Date>2017-12-20</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="19">
-            <Date>2013-12-21</Date>
-            <Version>4.3.6</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-12-04</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-11-25</Date>
+            <Version>5.2.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="17">
-            <Date>2013-12-12</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-11-19</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-08-21</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="15">
-            <Date>2013-11-11</Date>
-            <Version>4.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-07-04</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="14">
-            <Date>2013-11-05</Date>
-            <Version>4.2.18</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>5.1.14</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="13">
-            <Date>2013-10-10</Date>
-            <Version>4.2.18</Version>
-            <Comment>version bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-01-15</Date>
+            <Version>5.1.12</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2013-09-28</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-13</Date>
+            <Version>5.1.10</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2013-09-18</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.12</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="10">
-            <Date>2013-08-30</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-09-26</Date>
+            <Version>5.1.6</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>Kernel 3.10.6</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-24</Date>
+            <Version>5.1.4</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="7">
-            <Date>2013-07-06</Date>
-            <Version>4.2.16</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-08-17</Date>
+            <Version>5.1.4</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>5.1.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-07-22</Date>
+            <Version>5.1.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-04</Date>
-            <Version>4.2.12</Version>
-            <Comment>Update</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-04-14</Date>
-            <Version>4.2.12</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0b</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-03-02</Date>
-            <Version>4.2.8</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>5.0.12</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2013-01-22</Date>
-            <Version>4.2.6</Version>
+            <Date>2016-03-07</Date>
+            <Version>5.0.12</Version>
            <Comment>First release</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -0,0 +1,39 @@
+#
+# https://forums.virtualbox.org/viewtopic.php?uid=80969&f=7&t=70150&start=0
+# kernel 4.3-rc1 heads up
+#
+--- ./vboxdrv/linux/SUPDrv-linux.c.orig	2015-09-25 20:56:04.704532570 -0700
+++ ./vboxdrv/linux/SUPDrv-linux.c	2015-09-25 20:57:17.265521751 -0700
+@@ -485,6 +485,7 @@
+      * opened, at least we'll blindly assume that here.
+      */
+ #ifdef CONFIG_VBOXDRV_AS_MISC
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+     rc = misc_deregister(&gMiscDeviceUsr);
+     if (rc < 0)
+     {
+@@ -495,6 +496,10 @@
+     {
+         Log(("misc_deregister failed with rc=%#x on vboxdrv\n", rc));
+     }
+#else
+    misc_deregister(&gMiscDeviceUsr);
+    misc_deregister(&gMiscDeviceSys);
+#endif
+ #else  /* !CONFIG_VBOXDRV_AS_MISC */
+ # ifdef CONFIG_DEVFS_FS
+     /*
+--- ./vboxnetadp/linux/VBoxNetAdp-linux.c.orig	2015-09-25 20:55:42.309667865 -0700
+++ ./vboxnetadp/linux/VBoxNetAdp-linux.c	2015-09-25 20:58:49.331034237 -0700
+@@ -436,7 +436,11 @@
+ 
+     vboxNetAdpShutdown();
+     /* Remove control device */
+    #if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+     rc = misc_deregister(&g_CtlDev);
+    #else
+        misc_deregister(&g_CtlDev);
+    #endif
+     if (rc < 0)
+     {
+         printk(KERN_ERR "misc_deregister failed with rc=%x\n", rc);
@@ -3,7 +3,7 @@
 <PISI>
    <Source>
        <Name>module-virtualbox</Name>
-        <Homepage>http://www.virtualbox.org</Homepage>
+        <Homepage>https://www.virtualbox.org</Homepage>
        <Packager>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
@@ -12,16 +12,19 @@
        <IsA>driver</IsA>
        <Summary>Kernel modules for VirtualBox</Summary>
        <Description>This package provides the kernel support for VirtualBox.</Description>
-        <Archive sha1sum="14e3d8630f779dc1349d9aa488fa7e6604b9ba3e" type="tarxz">http://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.0.4.tar.xz</Archive>
+        <Archive sha1sum="5c9309d901ed24e4cd484dfd9b79367973df8151" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-6.0.12.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency version="4.2.5">kernel-module-headers</Dependency>
+            <Dependency version="4.19.56">kernel-module-headers</Dependency>
        </BuildDependencies>
+        <!--Patches>
+            <Patch>vbox_linux-4.3.diff</Patch>
+        </Patches-->
    </Source>

    <Package>
        <Name>module-virtualbox</Name>
        <RuntimeDependencies>
-            <Dependency version="4.2.5">kernel</Dependency>
+            <Dependency version="4.19.56">kernel</Dependency>
            <Dependency version="current">module-virtualbox-userspace</Dependency>
        </RuntimeDependencies>
        <Files>
@@ -47,411 +50,320 @@
    </Package>

    <History>
-        <Update release="57">
-            <Date>2015-11-30</Date>
-            <Version>5.0.4</Version>
-            <Comment>Rebuild for kernel-4.2.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="56">
-            <Date>2015-11-27</Date>
-            <Version>5.0.4</Version>
+        <Update release="45">
+            <Date>2019-09-29</Date>
+            <Version>6.0.12</Version>
            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="44">
+            <Date>2019-08-04</Date>
+            <Version>6.0.10</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="43">
+            <Date>2019-06-26</Date>
+            <Version>6.0.8</Version>
+            <Comment>Rebuild drivers</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="55">
-            <Date>2015-10-05</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.2.3.</Comment>
+        </Update>
+        <Update release="42">
+            <Date>2019-05-17</Date>
+            <Version>6.0.8</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="41">
+            <Date>2019-05-11</Date>
+            <Version>6.0.6</Version>
+            <Comment>Rebuild drivers</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="54">
-            <Date>2015-10-01</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.2.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-        <Update release="53">
-            <Date>2015-09-23</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="52">
-            <Date>2015-09-18</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="51">
-            <Date>2015-08-18</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="50">
-            <Date>2015-08-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.5.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="49">
-            <Date>2015-07-23</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="48">
-            <Date>2015-07-20</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="47">
-            <Date>2015-07-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="46">
-            <Date>2015-06-30</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="45">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="44">
-            <Date>2015-06-09</Date>
-            <Version>4.3.28</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="43">
-            <Date>2015-05-14</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="42">
-            <Date>2015-05-05</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="41">
-            <Date>2015-04-24</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="40">
-            <Date>2015-04-16</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="39">
-            <Date>2015-04-02</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
+        </Update>
+        <Update release="40">
+            <Date>2019-04-20</Date>
+            <Version>6.0.6</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="39">
+            <Date>2019-04-06</Date>
+            <Version>6.0.4</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="38">
-            <Date>2015-03-08</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-	  </Update>
+            <Date>2019-01-29</Date>
+            <Version>6.0.4</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="37">
-            <Date>2015-03-01</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
+            <Date>2019-01-20</Date>
+            <Version>6.0.2</Version>
+            <Comment>Version Bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="36">
-            <Date>2015-01-28</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Date>2019-01-16</Date>
+            <Version>6.0.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="35">
-            <Date>2015-01-09</Date>
-            <Version>4.3.20</Version>
-            <Comment>Version bump, kernel 3.18.1</Comment>
+            <Date>2018-12-22</Date>
+            <Version>6.0.0</Version>
+            <Comment>Version Bump</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="34">
-            <Date>2014-11-29</Date>
-            <Version>4.3.18</Version>
+            <Date>2018-11-23</Date>
+            <Version>5.2.22</Version>
            <Comment>Rebuild</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="33">
-            <Date>2014-11-21</Date>
-            <Version>4.3.18</Version>
+            <Date>2018-10-05</Date>
+            <Version>5.2.18</Version>
            <Comment>Rebuild</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="32">
-            <Date>2014-10-19</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, 4.3.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-09-16</Date>
+            <Version>5.2.18</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="31">
-            <Date>2014-09-19</Date>
-            <Version>4.3.16</Version>
-            <Comment>Version bump, 4.3.16</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-08-17</Date>
+            <Version>5.2.16</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="30">
-            <Date>2014-09-03</Date>
-            <Version>4.3.14</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-08-06</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="29">
-            <Date>2014-07-24</Date>
-            <Version>4.3.14</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
+            <Date>2018-07-15</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="28">
-            <Date>2014-06-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-07-12</Date>
+            <Version>5.2.12</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="27">
-            <Date>2014-05-29</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-05-10</Date>
+            <Version>5.2.12</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="26">
-            <Date>2014-05-02</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-28</Date>
+            <Version>5.2.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="25">
-            <Date>2014-04-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-04-18</Date>
+            <Version>5.2.10</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="24">
-            <Date>2014-04-07</Date>
-            <Version>4.3.10</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2018-03-15</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="23">
-            <Date>2014-03-29</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2018-03-11</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="22">
-            <Date>2014-03-09</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-03-03</Date>
+            <Version>5.2.8</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="21">
-            <Date>2014-03-01</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2018-01-06</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="20">
-            <Date>2014-01-17</Date>
-            <Version>4.3.6</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
+            <Date>2017-12-20</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="19">
-            <Date>2013-12-22</Date>
-            <Version>4.3.6</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-12-04</Date>
+            <Version>5.2.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-11-25</Date>
+            <Version>5.2.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
        </Update>
        <Update release="17">
-            <Date>2013-12-12</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-11-19</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-08-21</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="15">
-            <Date>2013-11-11</Date>
-            <Version>4.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-07-04</Date>
+            <Version>5.1.14</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="14">
-            <Date>2013-11-05</Date>
-            <Version>4.2.18</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>5.1.14</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="13">
-            <Date>2013-10-09</Date>
-            <Version>4.2.18</Version>
-            <Comment>version bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-01-15</Date>
+            <Version>5.1.12</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2013-09-28</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-13</Date>
+            <Version>5.1.10</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2013-09-18</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.12</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>Kernel 3.10.6</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-09-26</Date>
+            <Version>5.1.6</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2013-07-06</Date>
-            <Version>4.2.16</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-08-24</Date>
+            <Version>5.1.4</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="7">
-            <Date>2013-06-15</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-17</Date>
+            <Version>5.1.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>5.1.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2013-05-26</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.3</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-07-22</Date>
+            <Version>5.1.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-04</Date>
-            <Version>4.2.12</Version>
-            <Comment>Update</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-04-14</Date>
-            <Version>4.2.12</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0b</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-03-02</Date>
-            <Version>4.2.8</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>5.0.12</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2013-01-22</Date>
-            <Version>4.2.6</Version>
+            <Date>2016-03-07</Date>
+            <Version>5.0.12</Version>
            <Comment>First release</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PISI>
    <Source>
-        <Name>module-virtualbox-modules</Name>
+        <Name>module-virtualbox</Name>
        <Summary xml:lang="tr">VirtualBox için çekirdek modülleri</Summary>
        <Description xml:lang="tr">Bu paket VirtualBox için çekirdek desteği sunar.</Description>
    </Source>
@@ -13,9 +13,6 @@ from pisi.actionsapi import get
 KDIR = kerneltools.getKernelVersion()

 def build():
-    shelltools.system("patch -p1 < ndiswrapper-1.59.patch")
-    shelltools.system("patch -p1 < kernel-4.2.patch")
-    
    autotools.make("-C driver KVERS_UNAME=%s" % KDIR)

    autotools.make("-C utils")
@@ -1,33 +0,0 @@
-diff -Npur "ndiswrapper-1 .59.orig/driver/loader.c" "ndiswrapper-1 .59/driver/loader.c"
--- "ndiswrapper-1 .59.orig/driver/loader.c"	2013-11-28 20:42:35.000000000 +0100
-+++ "ndiswrapper-1 .59/driver/loader.c"	2015-08-01 18:25:08.302141265 +0200
-@@ -22,6 +22,7 @@
- #include <linux/kmod.h>
- #include <linux/miscdevice.h>
- #include <asm/uaccess.h>
-+#include <linux/vmalloc.h>
- 
- /*
-   Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318}
-diff -Npur "ndiswrapper-1 .59.orig/driver/ntoskernel.c" "ndiswrapper-1 .59/driver/ntoskernel.c"
--- "ndiswrapper-1 .59.orig/driver/ntoskernel.c"	2013-11-28 20:42:36.000000000 +0100
-+++ "ndiswrapper-1 .59/driver/ntoskernel.c"	2015-08-01 18:24:55.895942032 +0200
-@@ -19,6 +19,7 @@
- #include "pnp.h"
- #include "loader.h"
- #include "ntoskernel_exports.h"
-+#include <linux/vmalloc.h>
- 
- /* MDLs describe a range of virtual address with an array of physical
-  * pages right after the header. For different ranges of virtual
-diff -Npur "ndiswrapper-1 .59.orig/driver/pe_linker.c" "ndiswrapper-1 .59/driver/pe_linker.c"
--- "ndiswrapper-1 .59.orig/driver/pe_linker.c"	2013-11-28 20:42:36.000000000 +0100
-+++ "ndiswrapper-1 .59/driver/pe_linker.c"	2015-08-01 18:28:37.992752176 +0200
-@@ -25,6 +25,7 @@
- //#define DEBUGLINKER 2
- 
- #include "ntoskernel.h"
-+#include <linux/vmalloc.h>
- 
- #endif
- 
@@ -0,0 +1,55 @@
+commit fa2aeeccd5366378ca2eb83c6daee64b511fe792
+Author: Felix Yan <felixonmars@archlinux.org>
+Date:   Tue May 16 01:32:56 2017 +0800
+
+    Add support for Linux 4.11+
+
+diff --git a/ndiswrapper/driver/ndis.c b/ndiswrapper/driver/ndis.c
+index c1913a05..2ab4dd21 100644
+--- a/ndiswrapper/driver/ndis.c
+++ b/ndiswrapper/driver/ndis.c
+@@ -2258,7 +2258,9 @@ wstdcall void NdisMIndicateReceivePacket(struct ndis_mp_block *nmb,
+ 			WARNING("empty packet ignored");
+ 			continue;
+ 		}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ 		wnd->net_dev->last_rx = jiffies;
+#endif
+ 		/* get total number of bytes in packet */
+ 		NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
+ 						 &length, &total_length,
+@@ -2346,7 +2348,9 @@ wstdcall void EthRxIndicateHandler(struct ndis_mp_block *nmb, void *rx_ctx,
+ 		ERROR("nmb is NULL");
+ 		EXIT3(return);
+ 	}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ 	wnd->net_dev->last_rx = jiffies;
+#endif
+ 
+ 	if (look_ahead_size < packet_size) {
+ 		struct ndis_packet *packet;
+@@ -2461,7 +2465,9 @@ wstdcall void NdisMTransferDataComplete(struct ndis_mp_block *nmb,
+ 		WARNING("illegal packet");
+ 		EXIT3(return);
+ 	}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ 	wnd->net_dev->last_rx = jiffies;
+#endif
+ 	oob_data = NDIS_PACKET_OOB_DATA(packet);
+ 	skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
+ 		bytes_txed;
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index 3c4c6ff0..f1c52e51 100644
+--- a/ndiswrapper/driver/ntoskernel.h
+++ b/ndiswrapper/driver/ntoskernel.h
+@@ -296,6 +296,10 @@ static inline void (INIT_WORK)(struct work_struct *work, work_func_t func)
+ #define add_taint(flag, lockdep_ok) add_taint(flag)
+ #endif
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#include <linux/sched/signal.h>
+#endif
+
+ #include "winnt_types.h"
+ #include "ndiswrapper.h"
+ #include "pe_linker.h"
@@ -0,0 +1,27 @@
+commit eeac7ab831b3097005dadc64dd323f54ade30323
+Author: Felix Yan <felixonmars@archlinux.org>
+Date:   Mon Sep 11 12:52:36 2017 +0800
+
+    Add support for linux 4.13+
+
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index f1c52e51..1422bd4d 100644
+--- a/ndiswrapper/driver/ntoskernel.h
+++ b/ndiswrapper/driver/ntoskernel.h
+@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS];
+  */
+ #include <asm/dma-mapping.h>
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)			\
+ 	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,		\
+ 			   GFP_KERNEL | __GFP_REPEAT)
+#else
+#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)			\
+	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,		\
+			   GFP_KERNEL | __GFP_RETRY_MAYFAIL)
+#endif
+
+ #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle)		\
+ 	dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+ #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction)		\
@@ -0,0 +1,199 @@
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Wed, 13 Dec 2017 15:53:31 -0600
+Subject: [PATCH] Build fixes for Linux 4.15
+
+Fixes two build issues for 4.15:
+
+ - init_timer() was eliminated in 4.15, and all callers were
+   converted to using timer_setup(). The callback prototype has
+   also changed to pass a timer_list argument instead of callback
+   data, and from_timer() must be used to get to the object in
+   which the timer is embedded.
+
+ - usb_get_status() was changed to take an additional argument,
+   and usb_get_std_status() was added as a wrapper for callers to
+   use as a replacment. Call the wrapper in 4.15 and later.
+
+LP: #1737749
+---
+ driver/ntoskernel.c | 19 ++++++++++++++++++-
+ driver/usb.c        | 10 ++++++++--
+ driver/wrapndis.c   | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 54 insertions(+), 3 deletions(-)
+
+diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c
+index 4fe0dc1..156c688 100644
+--- a/driver/ntoskernel.c
+++ b/driver/ntoskernel.c
+@@ -77,7 +77,6 @@ u64 wrap_ticks_to_boot;
+ #if defined(CONFIG_X86_64)
+ static struct timer_list shared_data_timer;
+ struct kuser_shared_data kuser_shared_data;
+-static void update_user_shared_data_proc(unsigned long data);
+ #endif
+ 
+ WIN_SYMBOL_MAP("KeTickCount", &jiffies)
+@@ -91,7 +90,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info);
+ #endif
+ 
+ #if defined(CONFIG_X86_64)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void update_user_shared_data_proc(unsigned long data)
+#else
+static void update_user_shared_data_proc(struct timer_list *t)
+#endif
+ {
+ 	/* timer is supposed to be scheduled every 10ms, but bigger
+ 	 * intervals seem to work (tried up to 50ms) */
+@@ -407,9 +410,15 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type,
+ 	InitializeListHead(&dh->wait_blocks);
+ }
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void timer_proc(unsigned long data)
+ {
+ 	struct wrap_timer *wrap_timer = (struct wrap_timer *)data;
+#else
+static void timer_proc(struct timer_list *t)
+{
+	struct wrap_timer *wrap_timer = from_timer(wrap_timer, t, timer);
+#endif
+ 	struct nt_timer *nt_timer;
+ 	struct kdpc *kdpc;
+ 
+@@ -452,9 +461,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type,
+ 		return;
+ 	}
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wrap_timer->timer);
+ 	wrap_timer->timer.data = (unsigned long)wrap_timer;
+ 	wrap_timer->timer.function = timer_proc;
+#else
+	timer_setup(&wrap_timer->timer, timer_proc, 0);
+#endif
+ 	wrap_timer->nt_timer = nt_timer;
+ #ifdef TIMER_DEBUG
+ 	wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC;
+@@ -2559,9 +2572,13 @@ int ntoskernel_init(void)
+ #if defined(CONFIG_X86_64)
+ 	memset(&kuser_shared_data, 0, sizeof(kuser_shared_data));
+ 	*((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&shared_data_timer);
+ 	shared_data_timer.function = update_user_shared_data_proc;
+ 	shared_data_timer.data = 0;
+#else
+	timer_setup(&shared_data_timer, update_user_shared_data_proc, 0);
+#endif
+ #endif
+ 	return 0;
+ }
+diff --git a/driver/usb.c b/driver/usb.c
+index 3e7021a..e55c2c6 100644
+--- a/driver/usb.c
+++ b/driver/usb.c
+@@ -750,6 +750,12 @@ static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev,
+ 	USBEXIT(return NT_URB_STATUS(nt_urb));
+ }
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+#define wrap_usb_get_status usb_get_status
+#else
+#define wrap_usb_get_status usb_get_std_status
+#endif
+
+ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ 					   struct irp *irp)
+ {
+@@ -776,8 +782,8 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev,
+ 		return NT_URB_STATUS(nt_urb);
+ 	}
+ 	assert(status_req->transfer_buffer_length == sizeof(u16));
+-	ret = usb_get_status(udev, type, status_req->index,
+-			     status_req->transfer_buffer);
+	ret = wrap_usb_get_status(udev, type, status_req->index,
+				  status_req->transfer_buffer);
+ 	if (ret >= 0) {
+ 		assert(ret <= status_req->transfer_buffer_length);
+ 		status_req->transfer_buffer_length = ret;
+diff --git a/driver/wrapndis.c b/driver/wrapndis.c
+index 870e4c2..f653440 100644
+--- a/driver/wrapndis.c
+++ b/driver/wrapndis.c
+@@ -1093,9 +1093,15 @@ send_assoc_event:
+ 	EXIT2(return);
+ }
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void iw_stats_timer_proc(unsigned long data)
+ {
+ 	struct ndis_device *wnd = (struct ndis_device *)data;
+#else
+static void iw_stats_timer_proc(struct timer_list *t)
+{
+	struct ndis_device *wnd = from_timer(wnd, t, iw_stats_timer);
+#endif
+ 
+ 	ENTER2("%d", wnd->iw_stats_interval);
+ 	if (wnd->iw_stats_interval > 0) {
+@@ -1111,8 +1117,12 @@ static void add_iw_stats_timer(struct ndis_device *wnd)
+ 		return;
+ 	if (wnd->iw_stats_interval < 0)
+ 		wnd->iw_stats_interval *= -1;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	wnd->iw_stats_timer.data = (unsigned long)wnd;
+ 	wnd->iw_stats_timer.function = iw_stats_timer_proc;
+#else
+	timer_setup(&wnd->iw_stats_timer, iw_stats_timer_proc, 0);
+#endif
+ 	mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval);
+ }
+ 
+@@ -1124,9 +1134,15 @@ static void del_iw_stats_timer(struct ndis_device *wnd)
+ 	EXIT2(return);
+ }
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ static void hangcheck_proc(unsigned long data)
+ {
+ 	struct ndis_device *wnd = (struct ndis_device *)data;
+#else
+static void hangcheck_proc(struct timer_list *t)
+{
+	struct ndis_device *wnd = from_timer(wnd, t, hangcheck_timer);
+#endif
+ 
+ 	ENTER3("%d", wnd->hangcheck_interval);
+ 	if (wnd->hangcheck_interval > 0) {
+@@ -1147,8 +1163,12 @@ void hangcheck_add(struct ndis_device *wnd)
+ 		wnd->hangcheck_interval = hangcheck_interval * HZ;
+ 	if (wnd->hangcheck_interval < 0)
+ 		wnd->hangcheck_interval *= -1;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	wnd->hangcheck_timer.data = (unsigned long)wnd;
+ 	wnd->hangcheck_timer.function = hangcheck_proc;
+#else
+	timer_setup(&wnd->hangcheck_timer, hangcheck_proc, 0);
+#endif
+ 	mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval);
+ 	EXIT2(return);
+ }
+@@ -2138,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj,
+ 	wnd->dma_map_count = 0;
+ 	wnd->dma_map_addr = NULL;
+ 	wnd->nick[0] = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wnd->hangcheck_timer);
+#else
+	timer_setup(&wnd->hangcheck_timer, NULL, 0);
+#endif
+ 	wnd->scan_timestamp = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
+ 	init_timer(&wnd->iw_stats_timer);
+#else
+	timer_setup(&wnd->iw_stats_timer, NULL, 0);
+#endif
+ 	wnd->iw_stats_interval = 10 * HZ;
+ 	wnd->ndis_pending_work = 0;
+ 	memset(&wnd->essid, 0, sizeof(wnd->essid));
@@ -1,41 +0,0 @@
-From: Julian Andres Klode <jak@debian.org>
-Date: Tue, 12 May 2015 17:11:11 +0200
-Subject: Support kernel 4.0
-
---
- driver/ndis.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/driver/ndis.c b/driver/ndis.c
-index 9ace34b..fafd2e7 100644
--- a/driver/ndis.c
-+++ b/driver/ndis.c
-@@ -25,6 +25,10 @@
- #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE
- #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-+#define strncasecmp strnicmp
-+#endif
-+
- static struct work_struct ndis_work;
- static struct nt_list ndis_work_list;
- static spinlock_t ndis_work_list_lock;
-@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length,
- 	struct wrap_device_setting *setting;
- 	mutex_lock(&loader_mutex);
- 	nt_list_for_each_entry(setting, setting_list, list) {
-		if (strnicmp(keyname, setting->name, length) == 0) {
-+		if (strncasecmp(keyname, setting->name, length) == 0) {
- 			TRACE2("setting %s='%s'", keyname, setting->value);
- 			mutex_unlock(&loader_mutex);
- 			*param = ndis_encode_setting(setting, type);
-@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4)
- 
- 	mutex_lock(&loader_mutex);
- 	nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
-		if (strnicmp(keyname, setting->name, ansi.length) == 0) {
-+		if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
- 			mutex_unlock(&loader_mutex);
- 			if (ndis_decode_setting(setting, param))
- 				*status = NDIS_STATUS_FAILURE;
@@ -0,0 +1,100 @@
+diff -Nuar ndiswrapper-1.60.orig/ChangeLog ndiswrapper-1.60/ChangeLog
+--- ndiswrapper-1.60.orig/ChangeLog	2016-07-27 19:05:10.594950240 +0300
+++ ndiswrapper-1.60/ChangeLog	2016-07-27 19:06:04.678949272 +0300
+@@ -1,7 +1,3 @@
+-Version 1.60 2016-05-01
+-=======================
+-* Support for Linux kernel up to 4.5
+-
+ Version 1.59 2013-11-28
+ =======================
+ * Support for Linux kernels from 2.6.13 to 3.12
+diff -Nuar ndiswrapper-1.60.orig/driver/.gitignore ndiswrapper-1.60/driver/.gitignore
+--- ndiswrapper-1.60.orig/driver/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ndiswrapper-1.60/driver/.gitignore	2016-07-27 19:06:04.678949272 +0300
+@@ -0,0 +1,11 @@
+*.ko
+*.mod.c
+*.o
+.*.cmd
+*_exports.h
+/.tmp_versions/
+/Module.markers
+/Module.symvers
+/modules.order
+/ndis_exports.h
+/win2lin_stubs.h
+diff -Nuar ndiswrapper-1.60.orig/driver/loader.h ndiswrapper-1.60/driver/loader.h
+--- ndiswrapper-1.60.orig/driver/loader.h	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/loader.h	2016-07-27 19:06:09.795949180 +0300
+@@ -16,10 +16,6 @@
+ #ifndef _LOADER_H_
+ #define _LOADER_H_
+ 
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0)
+-#include <linux/vmalloc.h>
+-#endif
+-
+ #include "ndiswrapper.h"
+ 
+ #ifndef __KERNEL__
+diff -Nuar ndiswrapper-1.60.orig/driver/ntoskernel.h ndiswrapper-1.60/driver/ntoskernel.h
+--- ndiswrapper-1.60.orig/driver/ntoskernel.h	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/ntoskernel.h	2016-07-27 19:06:13.834949108 +0300
+@@ -46,6 +46,8 @@
+ #include <linux/percpu.h>
+ #include <linux/kthread.h>
+ #include <linux/workqueue.h>
+#include <linux/vmalloc.h>
+
+ 
+ #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+ #error "this module is for x86 or x86_64 architectures only"
+@@ -358,8 +360,18 @@
+ #define prandom_seed(seed) net_srandom(seed)
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+-#define strncasecmp strnicmp
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+static int strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	strnicmp(s1, s2, n);
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+static inline void netif_trans_update(struct net_device *dev)
+{
+	dev->trans_start = jiffies;
+}
+ #endif
+ 
+ /* TICK is 100ns */
+diff -Nuar ndiswrapper-1.60.orig/driver/wrapndis.c ndiswrapper-1.60/driver/wrapndis.c
+--- ndiswrapper-1.60.orig/driver/wrapndis.c	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/wrapndis.c	2016-07-27 19:06:23.295948938 +0300
+@@ -704,7 +704,7 @@
+ 			n = wnd->max_tx_packets;
+ 		n = mp_tx_packets(wnd, wnd->tx_ring_start, n);
+ 		if (n) {
+-			wnd->net_dev->trans_start = jiffies;
+			netif_trans_update(wnd->net_dev);
+ 			wnd->tx_ring_start =
+ 				(wnd->tx_ring_start + n) % TX_RING_SIZE;
+ 			wnd->is_tx_ring_full = 0;
+diff -Nuar ndiswrapper-1.60.orig/ndiswrapper.spec ndiswrapper-1.60/ndiswrapper.spec
+--- ndiswrapper-1.60.orig/ndiswrapper.spec	2016-07-27 19:05:10.594950240 +0300
+++ ndiswrapper-1.60/ndiswrapper.spec	2016-07-27 19:06:28.472948846 +0300
+@@ -1,5 +1,5 @@
+ # Define ndiswrapper_version only if it is not already defined.
+-%{!?ndiswrapper_version: %define ndiswrapper_version 1.60}
+%{!?ndiswrapper_version: %define ndiswrapper_version svn}
+ %{!?ndiswrapper_release: %define ndiswrapper_release 1}
+ 
+ # Define kernel version if not already defined
+diff -Nuar ndiswrapper-1.60.orig/utils/.gitignore ndiswrapper-1.60/utils/.gitignore
+--- ndiswrapper-1.60.orig/utils/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ndiswrapper-1.60/utils/.gitignore	2016-07-27 19:06:29.224948832 +0300
+@@ -0,0 +1 @@
+/loadndisdriver
@@ -5,31 +5,29 @@
        <Name>ndiswrapper</Name>
        <Homepage>http://ndiswrapper.sourceforge.net/</Homepage>
        <Packager>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Packager>
        <License>GPLv2</License>
        <IsA>app:console</IsA>
        <IsA>driver</IsA>
        <Summary>A network driver wrapper</Summary>
        <Description>module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers.</Description>
-        <Archive sha1sum="75fbbda677fe91ee07a6f6a8e19b1f3e2479540f" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz</Archive>
+        <Archive sha1sum="d98b97ff7e88d39b7966b4a3e7b7deeb7dc6e192" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.62.tar.gz</Archive>
        <BuildDependencies>
-             <Dependency version="4.2.5">kernel-module-headers</Dependency>
+             <Dependency version="4.19.56">kernel-module-headers</Dependency>
        </BuildDependencies>
-        <Patches>
-            <Patch>support_kernel-4.0.patch</Patch>
-        </Patches>
-         <AdditionalFiles>
-            <AdditionalFile target="ndiswrapper-1.59.patch">ndiswrapper-1.59.patch</AdditionalFile>
-            <AdditionalFile target="kernel-4.2.patch">kernel-4.2.patch</AdditionalFile>
-        </AdditionalFiles>
+        <!--Patches>
+            <Patch>linux-4.11.patch</Patch>
+            <Patch>linux-4.13.patch</Patch>
+            <Patch>linux-4.15.patch</Patch>
+        </Patches-->
    </Source>

    <Package>
        <Name>ndiswrapper</Name>
        <RuntimeDependencies>
-            <Dependency version="4.2.5">kernel</Dependency>
+            <Dependency version="4.19.56">kernel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -45,54 +43,187 @@
    </Package>

    <History>
-        <Update release="7">
-            <Date>2014-11-30</Date>
-            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.2.5.</Comment>
+        <Update release="26">
+            <Date>2019-06-26</Date>
+            <Version>1.62</Version>
+            <Comment>Rebuild drivers</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="25">
+            <Date>2019-05-11</Date>
+            <Version>1.62</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="24">
+            <Date>2019-05-11</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="23">
+            <Date>2019-04-06</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="22">
+            <Date>2019-01-20</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="21">
+            <Date>2018-12-22</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="20">
+            <Date>2018-10-05</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="19">
+            <Date>2018-08-07</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="18">
+            <Date>2018-07-15</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="17">
+            <Date>2018-07-12</Date>
+            <Version>1.61</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="16">
+            <Date>2018-04-28</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="15">
+            <Date>2018-03-11</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="14">
+            <Date>2018-03-03</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="13">
+            <Date>2018-01-06</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="12">
+            <Date>2017-12-20</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="11">
+            <Date>2017-12-04</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="10">
+            <Date>2017-11-19</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="9">
+            <Date>2017-08-21</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="8">
+            <Date>2017-07-04</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="7">
+            <Date>2017-02-07</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2014-11-27</Date>
-            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.2.4.</Comment>
+            <Date>2016-12-10</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="5">
-            <Date>2014-10-05</Date>
-            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.2.3.</Comment>
+            <Date>2016-11-02</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2014-10-01</Date>
-            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Date>2016-08-24</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2014-09-23</Date>
-            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Date>2016-08-06</Date>
+            <Version>1.60</Version>
+            <Comment>Release Bump, rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2014-08-18</Date>
+            <Date>2016-06-28</Date>
            <Version>1.59</Version>
-            <Comment>Rebuild for kernel-4.1.6.</Comment>
+            <Comment>Release Bump, rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2014-08-13</Date>
+            <Date>2016-03-07</Date>
            <Version>1.59</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -24,8 +24,12 @@ def setup():
 def build():
    kerneltools.build(debugSymbols=False)

+    
 def install():
    kerneltools.install()
+    
+    # add objtool for external module building and enabled VALIDATION_STACK option
+    pisitools.insinto("/usr/src/linux-headers-%s/tools/objtool" % get.srcVERSION(), "%s/tools/objtool/objtool" % get.curDIR())

    # Install kernel headers needed for out-of-tree module compilation
    kerneltools.installHeaders()
@@ -34,3 +38,23 @@ def install():

    # Generate some module lists to use within mkinitramfs
    shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix()))
+    
+    #mkinitcpio default config
+    pisitools.dodir("/etc/mkinitcpio.d")
+    shelltools.touch("linux.preset")
+        
+    shelltools.echo("linux.preset", "# mkinitcpio preset file for the 'linux' package\n" +
+                    
+                    'ALL_config="/etc/mkinitcpio.conf"\n'+
+                    
+                    'ALL_kver="/boot/kernel-%s"\n\n'% get.srcVERSION() +
+                    "PRESETS=('default' 'fallback') \n\n" +
+                    '#default_config="/etc/mkinitcpio.conf"\n' +
+                    'default_image="/boot/initramfs-%s.img"\n'% get.srcVERSION() +
+                    
+                    '#default_options=""\n\n' +
+                    '#fallback_config="/etc/mkinitcpio.conf"\n'+
+                    'fallback_image="/boot/initramfs-%s-fallback.img"\n'% get.srcVERSION() +
+                    'fallback_options="-S autodetect"\n')
+    
+    pisitools.insinto("/etc/mkinitcpio.d", "linux.preset")
@@ -0,0 +1,86 @@
+diff -Nuar linux-4.9.orig/fs/aufs/posix_acl.c linux-4.9/fs/aufs/posix_acl.c
+--- linux-4.9.orig/fs/aufs/posix_acl.c	2017-04-09 09:33:00.155052337 +0300
+++ linux-4.9/fs/aufs/posix_acl.c	2017-04-09 09:34:03.760053849 +0300
+@@ -1,5 +1,18 @@
+ /*
+  * Copyright (C) 2014-2016 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ /*
+@@ -36,6 +49,8 @@
+ 
+ 	/* always topmost only */
+ 	acl = get_acl(h_inode, type);
+	if (!IS_ERR_OR_NULL(acl))
+		set_cached_acl(inode, type, acl);
+ 
+ out:
+ 	ii_read_unlock(inode);
+@@ -77,8 +92,10 @@
+ 	ssz = au_sxattr(dentry, inode, &arg);
+ 	dput(dentry);
+ 	err = ssz;
+-	if (ssz >= 0)
+	if (ssz >= 0) {
+ 		err = 0;
+		set_cached_acl(inode, type, acl);
+	}
+ 
+ out:
+ 	return err;
+diff -Nuar linux-4.9.orig/fs/aufs/xattr.c linux-4.9/fs/aufs/xattr.c
+--- linux-4.9.orig/fs/aufs/xattr.c	2017-04-09 09:33:00.160052337 +0300
+++ linux-4.9/fs/aufs/xattr.c	2017-04-09 09:34:08.757053967 +0300
+@@ -1,11 +1,26 @@
+ /*
+  * Copyright (C) 2014-2016 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ /*
+  * handling xattr functions
+  */
+ 
+#include <linux/fs.h>
+#include <linux/posix_acl_xattr.h>
+ #include <linux/xattr.h>
+ #include "aufs.h"
+ 
+@@ -309,7 +324,11 @@
+ };
+ 
+ static const struct xattr_handler *au_xattr_handlers[] = {
+-	&au_xattr_handler,
+#ifdef CONFIG_FS_POSIX_ACL
+	&posix_acl_access_xattr_handler,
+	&posix_acl_default_xattr_handler,
+#endif
+	&au_xattr_handler, /* must be last */
+ 	NULL
+ };
+ 
@@ -47,10 +47,10 @@ diff -Nurp linux-4.2.2/arch/mips/Kconfig linux-4.2.2-3rd/arch/mips/Kconfig
 diff -Nurp linux-4.2.2/arch/powerpc/Kconfig linux-4.2.2-3rd/arch/powerpc/Kconfig
 --- linux-4.2.2/arch/powerpc/Kconfig	2015-08-30 21:34:09.000000000 +0300
 +++ linux-4.2.2-3rd/arch/powerpc/Kconfig	2015-09-29 23:02:44.025347276 +0300
-@@ -1092,3 +1092,5 @@ config PPC_LIB_RHEAP
- 	bool
- 
+@@ -1112,3 +1112,5 @@ config PPC_LIB_RHEAP
 source "arch/powerpc/kvm/Kconfig"
+ 
+ source "kernel/livepatch/Kconfig"
 +
 +source "3rdparty/Kconfig"
 diff -Nurp linux-4.2.2/arch/sparc/Kconfig linux-4.2.2-3rd/arch/sparc/Kconfig
@@ -83,10 +83,10 @@ diff -Nurp linux-4.2.2/Makefile linux-4.2.2-3rd/Makefile
 net-y		:= net/
 libs-y		:= lib/
 core-y		:= usr/
-diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/Makefile
--- linux-4.2.2/scripts/kconfig/Makefile	2015-08-30 21:34:09.000000000 +0300
-+++ linux-4.2.2-3rd/scripts/kconfig/Makefile	2015-09-29 23:04:06.298700940 +0300
-@@ -18,26 +18,26 @@ endif
+diff -Nurp linux-4.14/scripts/kconfig/Makefile linux-4.14-3rd/scripts/kconfig/Makefile
+--- linux-4.14/scripts/kconfig/Makefile
+++ linux-4.14-3rd/scripts/kconfig/Makefile
+@@ -19,28 +19,28 @@ endif
 # We need this, in case the user has it in its environment
 unexport CONFIG_
 
@@ -113,6 +113,8 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 -silentoldconfig: $(obj)/conf
 +silentoldconfig: $(obj)/conf 3rdparty/Makefile
 	$(Q)mkdir -p include/config include/generated
+ 	$(Q)test -e include/generated/autoksyms.h || \
+ 	    touch   include/generated/autoksyms.h
 	$< $(silent) --$@ $(Kconfig)
 
 -localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
@@ -120,7 +122,7 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 	$(Q)mkdir -p include/config include/generated
 	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
 	$(Q)if [ -f .config ]; then 					\
-@@ -80,7 +80,7 @@ simple-targets := oldconfig allnoconfig
+@@ -83,7 +83,7 @@ simple-targets := oldconfig allnoconfig
 	alldefconfig randconfig listnewconfig olddefconfig
 PHONY += $(simple-targets)
 
@@ -129,7 +131,7 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 	$< $(silent) --$@ $(Kconfig)
 
 PHONY += oldnoconfig savedefconfig defconfig
-@@ -88,12 +88,12 @@ PHONY += oldnoconfig savedefconfig defco
+@@ -91,12 +91,12 @@ PHONY += oldnoconfig savedefconfig defco
 # oldnoconfig is an alias of olddefconfig, because people already are dependent
 # on its behavior (sets new symbols to their default value but not 'n') with the
 # counter-intuitive name.
@@ -145,8 +147,8 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 ifeq ($(KBUILD_DEFCONFIG),)
 	$< $(silent) --defconfig $(Kconfig)
 else
-@@ -101,7 +101,7 @@ else
- 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+@@ -109,26 +109,26 @@ else
+ endif
 endif
 
 -%_defconfig: $(obj)/conf
@@ -154,7 +156,11 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
 configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
-@@ -112,14 +112,14 @@ configfiles=$(wildcard $(srctree)/kernel
+ 
+-%.config: $(obj)/conf
+%.config: $(obj)/conf 3rdparty/Makefile
+ 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
+ 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
 	+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 
 PHONY += kvmconfig
@@ -167,12 +173,13 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 +xenconfig: xen.config 3rdparty/Makefile
 	@:
 
-PHONY += tinyconfig
-+PHONY += tinyconfig 3rdparty/Makefile
- tinyconfig:
+ PHONY += tinyconfig
+-tinyconfig:
+tinyconfig: 
 	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
 
-@@ -183,6 +183,9 @@ gconf-objs	:= gconf.o zconf.tab.o
+ # Help text used by make help
+@@ -191,6 +191,9 @@ gconf-objs	:= gconf.o zconf.tab.o
 
 hostprogs-y := conf nconf mconf kxgettext qconf gconf
 
@@ -180,5 +187,5 @@ diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/
 +	pushd $(srctree)/3rdparty ; $(PERL) ./mkbuild.pl ; popd
 +
 clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck
- clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
+ clean-files	+= zconf.tab.c zconf.lex.c gconf.glade.h
 clean-files     += config.pot linux.pot
@@ -1,6 +1,6 @@
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c
--- linux-3.12.2/3rdparty/ndiswrapper/crt.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/crt.c linux-4.12.4-3rd/3rdparty/ndiswrapper/crt.c
+--- linux-4.12.4/3rdparty/ndiswrapper/crt.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/crt.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,589 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -471,7 +471,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59
 +noregparm void WIN_FUNC(_win_srand,1)
 +	(UINT seed)
 +{
-+	net_srandom(seed);
+	prandom_seed(seed);
 +}
 +
 +noregparm int WIN_FUNC(rand,0)
@@ -591,9 +591,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59
 +	printk(KERN_DEBUG "%s: %p: %s\n", ctx, from, buf);
 +	kfree(buf);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/divdi3.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c
--- linux-3.12.2/3rdparty/ndiswrapper/divdi3.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/divdi3.c linux-4.12.4-3rd/3rdparty/ndiswrapper/divdi3.c
+--- linux-4.12.4/3rdparty/ndiswrapper/divdi3.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/divdi3.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,329 @@
 +/* 64-bit multiplication and division
 +   Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003
@@ -924,9 +924,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/divdi3.c linux-3.12.2-ndiswrapper-1
 +  __udivmoddi4 (u, v, &w);
 +  return w;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/hal.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c
--- linux-3.12.2/3rdparty/ndiswrapper/hal.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/hal.c linux-4.12.4-3rd/3rdparty/ndiswrapper/hal.c
+--- linux-4.12.4/3rdparty/ndiswrapper/hal.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/hal.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,157 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -1085,9 +1085,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/hal.c linux-3.12.2-ndiswrapper-1.59
 +#endif
 +	nt_spin_unlock(lock);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/iw_ndis.c linux-4.12.4-3rd/3rdparty/ndiswrapper/iw_ndis.c
+--- linux-4.12.4/3rdparty/ndiswrapper/iw_ndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/iw_ndis.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,2001 @@
 + /*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -3090,9 +3090,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c linux-3.12.2-ndiswrapper-
 +};
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/iw_ndis.h linux-4.12.4-3rd/3rdparty/ndiswrapper/iw_ndis.h
+--- linux-4.12.4/3rdparty/ndiswrapper/iw_ndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/iw_ndis.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,194 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -3288,9 +3288,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h linux-3.12.2-ndiswrapper-
 +		    KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE };
 +
 +#endif // IW_NDIS_H
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h
--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/lin2win.h linux-4.12.4-3rd/3rdparty/ndiswrapper/lin2win.h
+--- linux-4.12.4/3rdparty/ndiswrapper/lin2win.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/lin2win.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,111 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -3403,9 +3403,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.h linux-3.12.2-ndiswrapper-
 +})
 +
 +#endif // CONFIG_X86_64
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S
--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/lin2win.S linux-4.12.4-3rd/3rdparty/ndiswrapper/lin2win.S
+--- linux-4.12.4/3rdparty/ndiswrapper/lin2win.S	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/lin2win.S	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,138 @@
 +/*
 + *  Copyright (C) 2011 Pavel Roskin
@@ -3545,9 +3545,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.S linux-3.12.2-ndiswrapper-
 +lin2win lin2win4, 4
 +lin2win lin2win5, 5
 +lin2win lin2win6, 6
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c
--- linux-3.12.2/3rdparty/ndiswrapper/loader.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/loader.c linux-4.12.4-3rd/3rdparty/ndiswrapper/loader.c
+--- linux-4.12.4/3rdparty/ndiswrapper/loader.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/loader.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,967 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -4516,9 +4516,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.c linux-3.12.2-ndiswrapper-1
 +	mutex_unlock(&loader_mutex);
 +	EXIT1(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h
--- linux-3.12.2/3rdparty/ndiswrapper/loader.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/loader.h linux-4.12.4-3rd/3rdparty/ndiswrapper/loader.h
+--- linux-4.12.4/3rdparty/ndiswrapper/loader.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/loader.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,108 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -4628,9 +4628,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1
 +#endif
 +
 +#endif /* LOADER_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/longlong.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h
--- linux-3.12.2/3rdparty/ndiswrapper/longlong.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/longlong.h linux-4.12.4-3rd/3rdparty/ndiswrapper/longlong.h
+--- linux-4.12.4/3rdparty/ndiswrapper/longlong.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/longlong.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,1333 @@
 +/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
 +   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
@@ -5965,9 +5965,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/longlong.h linux-3.12.2-ndiswrapper
 +#ifndef UDIV_NEEDS_NORMALIZATION
 +#define UDIV_NEEDS_NORMALIZATION 0
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/Makefile linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile
--- linux-3.12.2/3rdparty/ndiswrapper/Makefile	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/Makefile linux-4.12.4-3rd/3rdparty/ndiswrapper/Makefile
+--- linux-4.12.4/3rdparty/ndiswrapper/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/Makefile	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,213 @@
 +# Name of the module
 +MODNAME = ndiswrapper
@@ -6182,9 +6182,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/Makefile linux-3.12.2-ndiswrapper-1
 +	done
 +
 +.PHONY: all modules clean install config_check dist
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh
--- linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/mkexport.sh linux-4.12.4-3rd/3rdparty/ndiswrapper/mkexport.sh
+--- linux-4.12.4/3rdparty/ndiswrapper/mkexport.sh	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/mkexport.sh	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,42 @@
 +#! /bin/sh
 +
@@ -6228,9 +6228,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh linux-3.12.2-ndiswrappe
 +
 +echo "	{NULL, NULL}"
 +echo "};"
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh
--- linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/mkstubs.sh linux-4.12.4-3rd/3rdparty/ndiswrapper/mkstubs.sh
+--- linux-4.12.4/3rdparty/ndiswrapper/mkstubs.sh	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/mkstubs.sh	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,12 @@
 +#! /bin/sh
 +
@@ -6244,9 +6244,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh linux-3.12.2-ndiswrapper
 +		   win2lin(\1, \2)/p'   \
 +	   $file | sed -e 's/[ \t	]\+//' | sort -u; \
 +done
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/ndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ndis.c linux-4.12.4-3rd/3rdparty/ndiswrapper/ndis.c
+--- linux-4.12.4/3rdparty/ndiswrapper/ndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ndis.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,3025 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -6688,7 +6688,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +	struct wrap_device_setting *setting;
 +	mutex_lock(&loader_mutex);
 +	nt_list_for_each_entry(setting, setting_list, list) {
-+		if (strnicmp(keyname, setting->name, length) == 0) {
+		if (strncasecmp(keyname, setting->name, length) == 0) {
 +			TRACE2("setting %s='%s'", keyname, setting->value);
 +			mutex_unlock(&loader_mutex);
 +			*param = ndis_encode_setting(setting, type);
@@ -6752,7 +6752,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +
 +	mutex_lock(&loader_mutex);
 +	nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
-+		if (strnicmp(keyname, setting->name, ansi.length) == 0) {
+		if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
 +			mutex_unlock(&loader_mutex);
 +			if (ndis_decode_setting(setting, param))
 +				*status = NDIS_STATUS_FAILURE;
@@ -9273,9 +9273,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +		destroy_workqueue(ndis_wq);
 +	EXIT1(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/ndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ndis.h linux-4.12.4-3rd/3rdparty/ndiswrapper/ndis.h
+--- linux-4.12.4/3rdparty/ndiswrapper/ndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ndis.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,1309 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -10586,9 +10586,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.h linux-3.12.2-ndiswrapper-1.5
 +}
 +
 +#endif /* NDIS_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h
--- linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ndiswrapper.h linux-4.12.4-3rd/3rdparty/ndiswrapper/ndiswrapper.h
+--- linux-4.12.4/3rdparty/ndiswrapper/ndiswrapper.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ndiswrapper.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,219 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -10608,7 +10608,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrap
 +#ifndef _NDISWRAPPER_H_
 +#define _NDISWRAPPER_H_
 +
-+#define DRIVER_VERSION "1.59"
+#define DRIVER_VERSION "1.61"
 +#define UTILS_VERSION "1.9"
 +
 +#define DRIVER_NAME "ndiswrapper"
@@ -10809,9 +10809,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrap
 +#endif // __KERNEL__
 +
 +#endif // NDISWRAPPER_H
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ntoskernel.c linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel.c
+--- linux-4.12.4/3rdparty/ndiswrapper/ntoskernel.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,2677 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -13490,10 +13490,10 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c linux-3.12.2-ndiswrapp
 +
 +	EXIT2(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h	2013-11-28 21:42:11.000000000 +0200
-@@ -0,0 +1,1083 @@
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ntoskernel.h linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel.h
+--- linux-4.12.4/3rdparty/ndiswrapper/ntoskernel.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel.h	2016-10-09 18:45:08.027226096 +0300
+@@ -0,0 +1,1102 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
 + *
@@ -13542,6 +13542,8 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#include <linux/percpu.h>
 +#include <linux/kthread.h>
 +#include <linux/workqueue.h>
+#include <linux/vmalloc.h>
+
 +
 +#if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
 +#error "this module is for x86 or x86_64 architectures only"
@@ -13843,13 +13845,31 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
 +#endif
 +
-+#ifdef INIT_COMPLETION
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
 +static inline void reinit_completion(struct completion *x)
 +{
 +	INIT_COMPLETION(*x);
 +}
 +#endif
 +
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+#define prandom_seed(seed) net_srandom(seed)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+static int strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	strnicmp(s1, s2, n);
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+static inline void netif_trans_update(struct net_device *dev)
+{
+	dev->trans_start = jiffies;
+}
+#endif
+
 +/* TICK is 100ns */
 +#define TICKSPERSEC		10000000
 +#define TICKSPERMSEC		10000
@@ -14293,9 +14313,8 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#define nt_spin_unlock_irqrestore(lock, flags)				\
 +do {									\
 +	nt_spin_unlock(lock);						\
-+	preempt_enable_no_resched();					\
+	preempt_enable();						\
 +	local_irq_restore(flags);					\
-+	preempt_check_resched();					\
 +} while (0)
 +
 +static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
@@ -14577,9 +14596,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#endif
 +
 +#endif // _NTOSKERNEL_H_
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/ntoskernel_io.c linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel_io.c
+--- linux-4.12.4/3rdparty/ndiswrapper/ntoskernel_io.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/ntoskernel_io.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,1161 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -15742,9 +15761,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c linux-3.12.2-ndiswr
 +	IOTRACE("LowLimit: 0x%lx, HighLimit: 0x%lx", *LowLimit, *HighLimit);
 +	IOEXIT(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c
--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/pe_linker.c linux-4.12.4-3rd/3rdparty/ndiswrapper/pe_linker.c
+--- linux-4.12.4/3rdparty/ndiswrapper/pe_linker.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/pe_linker.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,600 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -16346,9 +16365,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c linux-3.12.2-ndiswrappe
 +	}
 +	return 0;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h
--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/pe_linker.h linux-4.12.4-3rd/3rdparty/ndiswrapper/pe_linker.h
+--- linux-4.12.4/3rdparty/ndiswrapper/pe_linker.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/pe_linker.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,992 @@
 +/*
 + * This file is an excerpt of winnt.h from WINE, which bears the
@@ -17342,9 +17361,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h linux-3.12.2-ndiswrappe
 +	WORD	Length;
 +	CHAR	NameString[ 1 ];
 +} IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING;
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c
--- linux-3.12.2/3rdparty/ndiswrapper/pnp.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/pnp.c linux-4.12.4-3rd/3rdparty/ndiswrapper/pnp.c
+--- linux-4.12.4/3rdparty/ndiswrapper/pnp.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/pnp.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,697 @@
 +/*
 + *  Copyright (C) 2005 Giridhar Pemmasani
@@ -18043,9 +18062,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.c linux-3.12.2-ndiswrapper-1.59
 +}
 +
 +#endif // USB
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h
--- linux-3.12.2/3rdparty/ndiswrapper/pnp.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/pnp.h linux-4.12.4-3rd/3rdparty/ndiswrapper/pnp.h
+--- linux-4.12.4/3rdparty/ndiswrapper/pnp.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/pnp.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,36 @@
 +/*
 + *  Copyright (C) 2005 Giridhar Pemmasani
@@ -18083,9 +18102,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.h linux-3.12.2-ndiswrapper-1.59
 +int wrap_pnp_resume_usb_device(struct usb_interface *intf);
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/proc.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c
--- linux-3.12.2/3rdparty/ndiswrapper/proc.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/proc.c linux-4.12.4-3rd/3rdparty/ndiswrapper/proc.c
+--- linux-4.12.4/3rdparty/ndiswrapper/proc.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/proc.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,588 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -18675,9 +18694,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/proc.c linux-3.12.2-ndiswrapper-1.5
 +	remove_proc_entry("debug", wrap_procfs_entry);
 +	proc_remove(wrap_procfs_entry);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/rtl.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c
--- linux-3.12.2/3rdparty/ndiswrapper/rtl.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/rtl.c linux-4.12.4-3rd/3rdparty/ndiswrapper/rtl.c
+--- linux-4.12.4/3rdparty/ndiswrapper/rtl.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/rtl.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,715 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -19394,9 +19413,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/rtl.c linux-3.12.2-ndiswrapper-1.59
 +	TRACE1("version: %d", version);
 +	return TRUE;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c
--- linux-3.12.2/3rdparty/ndiswrapper/usb.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/usb.c linux-4.12.4-3rd/3rdparty/ndiswrapper/usb.c
+--- linux-4.12.4/3rdparty/ndiswrapper/usb.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/usb.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,1496 @@
 +/*
 + *  Copyright (C) 2004 Jan Kiszka
@@ -20894,9 +20913,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.c linux-3.12.2-ndiswrapper-1.59
 +	kill_all_urbs(wd, 0);
 +	USBEXIT(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h
--- linux-3.12.2/3rdparty/ndiswrapper/usb.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/usb.h linux-4.12.4-3rd/3rdparty/ndiswrapper/usb.h
+--- linux-4.12.4/3rdparty/ndiswrapper/usb.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/usb.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,360 @@
 +/*
 + *  Copyright (C) 2004 Jan Kiszka
@@ -21258,9 +21277,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.h linux-3.12.2-ndiswrapper-1.59
 +			     struct io_stack_location *irp_sl);
 +
 +#endif /* USB_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S
--- linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/win2lin_stubs.S linux-4.12.4-3rd/3rdparty/ndiswrapper/win2lin_stubs.S
+--- linux-4.12.4/3rdparty/ndiswrapper/win2lin_stubs.S	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/win2lin_stubs.S	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,253 @@
 +/*
 + *  Copyright (C) 2005 Karl Vogel, Giridhar Pemmasani
@@ -21515,9 +21534,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S linux-3.12.2-ndiswr
 +#include "win2lin_stubs.h"
 +
 +#endif	/* CONFIG_X86_64 */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h
--- linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/winnt_types.h linux-4.12.4-3rd/3rdparty/ndiswrapper/winnt_types.h
+--- linux-4.12.4/3rdparty/ndiswrapper/winnt_types.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/winnt_types.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,1701 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -23220,9 +23239,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h linux-3.12.2-ndiswrap
 +
 +
 +#endif /* WINNT_TYPES_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/workqueue.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c
--- linux-3.12.2/3rdparty/ndiswrapper/workqueue.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/workqueue.c linux-4.12.4-3rd/3rdparty/ndiswrapper/workqueue.c
+--- linux-4.12.4/3rdparty/ndiswrapper/workqueue.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/workqueue.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,279 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23503,9 +23522,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/workqueue.c linux-3.12.2-ndiswrappe
 +		wrap_destroy_wq_on(workq, i);
 +	kfree(workq);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapmem.c linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapmem.c
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapmem.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapmem.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,366 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23873,9 +23892,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c linux-3.12.2-ndiswrapper-
 +#endif
 +	return;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapmem.h linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapmem.h
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapmem.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapmem.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,97 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23974,9 +23993,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h linux-3.12.2-ndiswrapper-
 +#endif // ALLOC_DEBUG
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapndis.c linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapndis.c
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapndis.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,2186 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -24684,7 +24703,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper
 +			n = wnd->max_tx_packets;
 +		n = mp_tx_packets(wnd, wnd->tx_ring_start, n);
 +		if (n) {
-+			wnd->net_dev->trans_start = jiffies;
+			netif_trans_update(wnd->net_dev);
 +			wnd->tx_ring_start =
 +				(wnd->tx_ring_start + n) % TX_RING_SIZE;
 +			wnd->is_tx_ring_full = 0;
@@ -26164,9 +26183,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper
 +	if (wrapndis_wq)
 +		destroy_workqueue(wrapndis_wq);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapndis.h linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapndis.h
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapndis.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,86 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -26254,9 +26273,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h linux-3.12.2-ndiswrapper
 +struct iw_statistics *get_iw_stats(struct net_device *dev);
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapper.c linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapper.c
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapper.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapper.c	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,111 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -26369,9 +26388,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.c linux-3.12.2-ndiswrapper-
 +
 +module_init(wrapper_init);
 +module_exit(wrapper_exit);
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.12.4/3rdparty/ndiswrapper/wrapper.h linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapper.h
+--- linux-4.12.4/3rdparty/ndiswrapper/wrapper.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.12.4-3rd/3rdparty/ndiswrapper/wrapper.h	2016-10-09 18:45:08.027226096 +0300
@@ -0,0 +1,24 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -1,32 +0,0 @@
-
-Adapt for strnicmp has been replaced by strncasecmp,
-and removed upstream in v4.0-rc1~98:
-
-From af3cd13501eb04ca61d017ff4406f1cbffafdc04 Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Date: Thu, 12 Feb 2015 15:02:15 -0800
-Subject: lib/string.c: remove strnicmp()
-
-
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
-
--- linux/3rdparty/ndiswrapper/ndis.c.orig
-+++ linux/3rdparty/ndiswrapper/ndis.c
-@@ -438,7 +438,7 @@ static int read_setting(struct nt_list *
- 	struct wrap_device_setting *setting;
- 	mutex_lock(&loader_mutex);
- 	nt_list_for_each_entry(setting, setting_list, list) {
-		if (strnicmp(keyname, setting->name, length) == 0) {
-+		if (strncasecmp(keyname, setting->name, length) == 0) {
- 			TRACE2("setting %s='%s'", keyname, setting->value);
- 			mutex_unlock(&loader_mutex);
- 			*param = ndis_encode_setting(setting, type);
-@@ -502,7 +502,7 @@ wstdcall void WIN_FUNC(NdisWriteConfigur
- 
- 	mutex_lock(&loader_mutex);
- 	nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
-		if (strnicmp(keyname, setting->name, ansi.length) == 0) {
-+		if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
- 			mutex_unlock(&loader_mutex);
- 			if (ndis_decode_setting(setting, param))
- 				*status = NDIS_STATUS_FAILURE;
@@ -0,0 +1,43 @@
+
+last_rx is gone, most drivers does not really need/use it anyway.
+
+Also, include signal.h to fix  implicit deklaration of function ”signal_pending”
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+--- linux/3rdparty/ndiswrapper/ndis.c.orig	2016-10-09 18:45:08.027226096 +0300
+++ linux/3rdparty/ndiswrapper/ndis.c	2017-08-04 00:09:49.264110609 +0300
+@@ -2258,7 +2258,6 @@ wstdcall void NdisMIndicateReceivePacket
+ 			WARNING("empty packet ignored");
+ 			continue;
+ 		}
+-		wnd->net_dev->last_rx = jiffies;
+ 		/* get total number of bytes in packet */
+ 		NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
+ 						 &length, &total_length,
+@@ -2346,7 +2345,6 @@ wstdcall void EthRxIndicateHandler(struc
+ 		ERROR("nmb is NULL");
+ 		EXIT3(return);
+ 	}
+-	wnd->net_dev->last_rx = jiffies;
+ 
+ 	if (look_ahead_size < packet_size) {
+ 		struct ndis_packet *packet;
+@@ -2461,7 +2459,6 @@ wstdcall void NdisMTransferDataComplete(
+ 		WARNING("illegal packet");
+ 		EXIT3(return);
+ 	}
+-	wnd->net_dev->last_rx = jiffies;
+ 	oob_data = NDIS_PACKET_OOB_DATA(packet);
+ 	skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
+ 		bytes_txed;
+--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig	2017-08-03 23:52:29.015367906 +0300
+++ linux/3rdparty/ndiswrapper/ntoskernel.h	2017-08-04 00:17:41.334914691 +0300
+@@ -33,6 +33,7 @@
+ #include <linux/ctype.h>
+ #include <linux/list.h>
+ #include <linux/sched.h>
+#include <linux/sched/signal.h>
+ #include <linux/usb.h>
+ #include <linux/spinlock.h>
+ #include <asm/mman.h>
@@ -0,0 +1,16 @@
+
+__GFP_REPEAT is now __GFP_RETRY_MAYFAIL
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig	2017-10-15 01:11:56.041892449 +0300
+++ linux/3rdparty/ndiswrapper/ntoskernel.h	2017-10-15 01:11:06.159204294 +0300
+@@ -122,7 +122,7 @@ static cpumask_t cpumasks[NR_CPUS];
+ 
+ #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle)			\
+ 	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,		\
+-			   GFP_KERNEL | __GFP_REPEAT)
+			   GFP_KERNEL | __GFP_RETRY_MAYFAIL)
+ #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle)		\
+ 	dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+ #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction)		\
@@ -1,30 +0,0 @@
--- linux/3rdparty/ndiswrapper/loader.c.orig	2015-09-30 00:51:13.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/loader.c	2015-09-30 01:27:16.209213900 +0300
-@@ -21,6 +21,7 @@
- #include <linux/module.h>
- #include <linux/kmod.h>
- #include <linux/miscdevice.h>
-+#include <linux/vmalloc.h>
- #include <asm/uaccess.h>
- 
- /*
--- linux/3rdparty/ndiswrapper/ntoskernel.c.orig	2015-09-30 00:51:13.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/ntoskernel.c	2015-09-30 01:29:08.011792825 +0300
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <linux/vmalloc.h>
- #include "ntoskernel.h"
- #include "ndis.h"
- #include "usb.h"
--- linux/3rdparty/ndiswrapper/pe_linker.c.orig	2015-09-30 00:51:13.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/pe_linker.c	2015-09-30 01:30:49.965320953 +0300
-@@ -19,6 +19,7 @@
- 
- #else
- 
-+#include <linux/vmalloc.h>
- #include <linux/types.h>
- #include <asm/errno.h>
- 
@@ -1,33 +0,0 @@
-
-Fix build with kernel-3.14
-
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
-
- 3rdparty/ndiswrapper/crt.c        |    2 +-
- 3rdparty/ndiswrapper/ntoskernel.h |    3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
--- linux/3rdparty/ndiswrapper/crt.c.orig	2014-04-26 19:10:55.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/crt.c	2014-04-26 19:25:27.766116082 +0300
-@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3)
- noregparm void WIN_FUNC(_win_srand,1)
- 	(UINT seed)
- {
-	net_srandom(seed);
-+	prandom_seed((__force u32) seed);
- }
- 
- noregparm int WIN_FUNC(rand,0)
--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig	2014-04-26 19:42:32.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/ntoskernel.h	2014-04-26 19:59:13.662522942 +0300
-@@ -798,9 +798,8 @@ do {									\
- #define nt_spin_unlock_irqrestore(lock, flags)				\
- do {									\
- 	nt_spin_unlock(lock);						\
-	preempt_enable_no_resched();					\
-+	preempt_enable();						\
- 	local_irq_restore(flags);					\
-	preempt_check_resched();					\
- } while (0)
- 
- static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
@@ -1,138 +0,0 @@
-From:
-https://github.com/lwfinger/rtl8723bs/commit/49fcb39bc7dc0b7ae61463d493c0b630dc6a27ca
-
-From 49fcb39bc7dc0b7ae61463d493c0b630dc6a27ca Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sat, 15 Aug 2015 10:51:20 -0500
-Subject: [PATCH] rtl8723bs: Fix builds on kernel 4.2
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-[adapted to mga kernel / tmb]
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
---
- hal/hal_com_phycfg.c    | 38 +++++++++++++++++++-------------------
- os_dep/ioctl_cfg80211.c |  5 +++++
- 2 files changed, 24 insertions(+), 19 deletions(-)
-
- 3rdparty/rtl8723bs/hal/hal_com_phycfg.c    |   38 ++++++++++++++---------------
- 3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c |    5 +++
- 2 files changed, 24 insertions(+), 19 deletions(-)
-
-diff -Nurp linux/3rdparty/rtl8723bs.orig/hal/hal_com_phycfg.c linux/3rdparty/rtl8723bs/hal/hal_com_phycfg.c
--- linux/3rdparty/rtl8723bs.orig/hal/hal_com_phycfg.c	2015-09-30 00:51:13.000000000 +0300
-+++ linux/3rdparty/rtl8723bs/hal/hal_com_phycfg.c	2015-09-30 01:49:37.475440016 +0300
-@@ -2254,7 +2254,7 @@ Hal_ChannelPlanToRegulation(
- #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
- 
- extern char *rtw_phy_file_path;
-static char	file_path[PATH_MAX];
-+static char	rtl_file_path[PATH_MAX];
- 
- #define GetLineFromBuffer(buffer)	 strsep(&buffer, "\n")
- 
-@@ -2276,11 +2276,11 @@ phy_ConfigMACWithParaFile(
- 
- 	if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 	
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-@@ -2375,11 +2375,11 @@ phy_ConfigBBWithParaFile(
- 
- 	if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 	
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-@@ -2824,11 +2824,11 @@ phy_ConfigBBWithPgParaFile(
- 
- 	if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 	
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-@@ -2904,11 +2904,11 @@ PHY_ConfigRFWithParaFile(
- 
- 	if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-@@ -3178,11 +3178,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
- 
- 	if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 	
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-@@ -3527,11 +3527,11 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
- 
- 	if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
- 	{
-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
-+		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
- 	
-		if (rtw_is_file_readable(file_path) == true)
-+		if (rtw_is_file_readable(rtl_file_path) == true)
- 		{
-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
-+			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
- 			if (rlen > 0)
- 			{
- 				rtStatus = _SUCCESS;
-diff -Nurp linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
--- linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c	2015-09-30 00:51:13.000000000 +0300
-+++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c	2015-09-30 01:49:37.476440020 +0300
-@@ -587,7 +587,12 @@ void rtw_cfg80211_indicate_disconnect(_a
- 
- 	if (!padapter->mlmepriv.not_indic_disco) {
- 		if(check_fwstate(&padapter->mlmepriv, _FW_LINKED))		
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
-+			cfg80211_disconnected(padapter->pnetdev, 0,
-+					      NULL, 0, true, GFP_ATOMIC);
-+#else
- 			cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, GFP_ATOMIC);
-+#endif
- 		else
- 			cfg80211_connect_result(padapter->pnetdev, NULL, NULL, 0, NULL, 0, 
- 				WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/);
@@ -1,23 +0,0 @@
-From 842e61cb85813b1ed8a1646cbe6739950c0c9822 Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Thu, 7 May 2015 19:08:17 +0000
-Subject: [PATCH] rtl8723bs: Fix Makefile to allow warnings
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git linux.old/3rdparty/rtl8723bs/Makefile linux/3rdparty/rtl8723bs/Makefile
-index a4d9f45..4da73fa 100644
--- linux.old/3rdparty/rtl8723bs/Makefile
-+++ linux/3rdparty/rtl8723bs/Makefile
-@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -O1
- #EXTRA_CFLAGS += -O3
- #EXTRA_CFLAGS += -Wall
- #EXTRA_CFLAGS += -Wextra
-EXTRA_CFLAGS += -Werror
-+#EXTRA_CFLAGS += -Werror
- #EXTRA_CFLAGS += -pedantic
- #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
- 
@@ -0,0 +1,40 @@
+From 61f9738d65094a6b18d22c7beb6bb8c3dc0606b9 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 26 Oct 2015 15:20:46 +0100
+Subject: [PATCH] ACPI / video: Add a quirk to force acpi-video backlight on
+ Dell XPS L421X
+
+Just like the Dell XPS 15 (L521X) the Dell XPS 14 (L421X) needs to use
+the acpi-video backlight interface rather then the native one for backlight
+control to work, add a quirk for this.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1272633
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/video_detect.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
+index 0d3a384..daaf1c4 100644
+--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
+@@ -233,6 +233,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
+ 		},
+ 	},
+ 	{
+	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1272633 */
+	 .callback = video_detect_force_video,
+	 .ident = "Dell XPS14 L421X",
+	 .matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),
+		},
+	},
+	{
+ 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
+ 	 .callback = video_detect_force_video,
+ 	 .ident = "Dell XPS15 L521X",
+-- 
+2.3.10
+
@@ -0,0 +1,34 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Subject: [PATCH 2/2] PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L
+Date: Fri,  2 Mar 2018 11:36:33 +0100
+
+The Highpoint RocketRAID 644L uses a Marvel 88SE9235 controller, as with
+other Marvel controllers this needs a function 1 DMA alias quirk.
+
+Note the RocketRAID 642L uses the same Marvel 88SE9235 controller and
+already is listed with a function 1 DMA alias quirk.
+
+Cc: stable@vger.kernel.org
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1534106
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/pci/quirks.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 8b14bd326d4a..46d47bd6ca1f 100644
+--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
+@@ -3908,6 +3908,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9230,
+ 			 quirk_dma_func1_alias);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TTI, 0x0642,
+ 			 quirk_dma_func1_alias);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TTI, 0x0645,
+			 quirk_dma_func1_alias);
+ /* https://bugs.gentoo.org/show_bug.cgi?id=497630 */
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_JMICRON,
+ 			 PCI_DEVICE_ID_JMICRON_JMB388_ESD,
+-- 
+2.14.3
+
+
@@ -0,0 +1,49 @@
+From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
+Subject: [PATCH] ACPI / EC: Restore polling during noirq suspend/resume phases
+Date: Fri, 09 Feb 2018 22:55:28 +0100
+
+From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+Commit 662591461c4b (ACPI / EC: Drop EC noirq hooks to fix a
+regression) modified the ACPI EC driver so that it doesn't switch
+over to busy polling mode during noirq stages of system suspend and
+resume in an attempt to fix an issue resulting from that behavior.
+
+However, that modification introduced a system resume regression on
+Thinkpad X240, so make the EC driver switch over to the polling mode
+during noirq stages of system suspend and resume again, which
+effectively reverts the problematic commit.
+
+Fixes: 662591461c4b (ACPI / EC: Drop EC noirq hooks to fix a regression)
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=197863
+Reported-by: Markus Demleitner <m@tfiu.de>
+Tested-by: Markus Demleitner <m@tfiu.de>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/ec.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: linux-pm/drivers/acpi/ec.c
+===================================================================
+--- linux-pm.orig/drivers/acpi/ec.c
+++ linux-pm/drivers/acpi/ec.c
+@@ -1927,6 +1927,9 @@ static int acpi_ec_suspend_noirq(struct
+ 	    ec->reference_count >= 1)
+ 		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
+ 
+	if (acpi_sleep_no_ec_events())
+		acpi_ec_enter_noirq(ec);
+
+ 	return 0;
+ }
+ 
+@@ -1934,6 +1937,9 @@ static int acpi_ec_resume_noirq(struct d
+ {
+ 	struct acpi_ec *ec = acpi_driver_data(to_acpi_device(dev));
+ 
+	if (acpi_sleep_no_ec_events())
+		acpi_ec_leave_noirq(ec);
+
+ 	if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) &&
+ 	    ec->reference_count >= 1)
+ 		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
@@ -0,0 +1,46 @@
+From 863204cfdae98626a92535ac928ad79f4d6b74ff Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 6 Dec 2017 14:17:17 +0100
+Subject: [PATCH] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
+
+In configurations without CONFIG_OMAP3 but with secure RAM support,
+we now run into a link failure:
+
+arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram':
+omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context'
+
+The omap3_save_secure_ram() function is only called from the OMAP34xx
+power management code, so we can simply hide that function in the
+appropriate #ifdef.
+
+Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context")
+Acked-by: Tony Lindgren <tony@atomide.com>
+Tested-by: Dan Murphy <dmurphy@ti.com>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+---
+ arch/arm/mach-omap2/omap-secure.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
+index 9ff92050053c..fa7f308c9027 100644
+--- a/arch/arm/mach-omap2/omap-secure.c
+++ b/arch/arm/mach-omap2/omap-secure.c
+@@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)
+ 	return omap_secure_memblock_base;
+ }
+ 
+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
+ u32 omap3_save_secure_ram(void __iomem *addr, int size)
+ {
+ 	u32 ret;
+@@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)
+ 
+ 	return ret;
+ }
+#endif
+ 
+ /**
+  * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
+-- 
+2.16.2
+
@@ -0,0 +1,37 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Subject: [PATCH 1/2] ahci: Add PCI-id for the Highpoint Rocketraid 644L card
+Date: Fri,  2 Mar 2018 11:36:32 +0100
+
+Like the Highpoint Rocketraid 642L and cards using a Marvel 88SE9235
+controller in general, this RAID card also supports AHCI mode and short
+of a custom driver, this is the only way to make it work under Linux.
+
+Note that even though the card is called to 644L, it has a product-id
+of 0x0645.
+
+Cc: stable@vger.kernel.org
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1534106
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/ata/ahci.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index 355a95a83a34..1ff17799769d 100644
+--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
+@@ -550,7 +550,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+ 	  .driver_data = board_ahci_yes_fbs },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
+ 	  .driver_data = board_ahci_yes_fbs },
+-	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642),
+	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), /* highpoint rocketraid 642L */
+	  .driver_data = board_ahci_yes_fbs },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0645), /* highpoint rocketraid 644L */
+ 	  .driver_data = board_ahci_yes_fbs },
+ 
+ 	/* Promise */
+-- 
+2.14.3
+
+
@@ -20,12 +20,13 @@ diff --git a/drivers/Makefile b/drivers/Makefile
 index 932e8bf..e8df3d0 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -64,9 +64,9 @@ obj-y				+= base/ block/ misc/ mfd/ nfc/
+@@ -69,10 +69,10 @@ obj-$(CONFIG_LIBNVDIMM)		+= nvdimm/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)		+= nubus/
 obj-y				+= macintosh/
 -obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_SCSI)		+= scsi/
+ obj-y				+= nvme/
 obj-$(CONFIG_ATA)		+= ata/
 +obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_TARGET_CORE)	+= target/
@@ -0,0 +1,107 @@
+From 614822f81f606e0064acdae11d9ec1efd3db4190 Mon Sep 17 00:00:00 2001
+From: Luca Miccio <lucmiccio@gmail.com>
+Date: Mon, 13 Nov 2017 07:34:08 +0100
+Subject: [PATCH] block, bfq: add missing invocations of
+ bfqg_stats_update_io_add/remove
+
+bfqg_stats_update_io_add and bfqg_stats_update_io_remove are to be
+invoked, respectively, when an I/O request enters and when an I/O
+request exits the scheduler. Unfortunately, bfq does not fully comply
+with this scheme, because it does not invoke these functions for
+requests that are inserted into or extracted from its priority
+dispatch list. This commit fixes this mistake.
+
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Luca Miccio <lucmiccio@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 889a8549d97f..91703eba63f0 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -1359,7 +1359,6 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd,
+ 			bfqq->ttime.last_end_request +
+ 			bfqd->bfq_slice_idle * 3;
+ 
+-	bfqg_stats_update_io_add(bfqq_group(RQ_BFQQ(rq)), bfqq, rq->cmd_flags);
+ 
+ 	/*
+ 	 * bfqq deserves to be weight-raised if:
+@@ -1633,7 +1632,6 @@ static void bfq_remove_request(struct request_queue *q,
+ 	if (rq->cmd_flags & REQ_META)
+ 		bfqq->meta_pending--;
+ 
+-	bfqg_stats_update_io_remove(bfqq_group(bfqq), rq->cmd_flags);
+ }
+ 
+ static bool bfq_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio)
+@@ -1746,6 +1744,7 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,
+ 		bfqq->next_rq = rq;
+ 
+ 	bfq_remove_request(q, next);
+	bfqg_stats_update_io_remove(bfqq_group(bfqq), next->cmd_flags);
+ 
+ 	spin_unlock_irq(&bfqq->bfqd->lock);
+ end:
+@@ -3700,6 +3699,9 @@ static struct request *bfq_dispatch_request(struct blk_mq_hw_ctx *hctx)
+ 	spin_lock_irq(&bfqd->lock);
+ 
+ 	rq = __bfq_dispatch_request(hctx);
+	if (rq && RQ_BFQQ(rq))
+		bfqg_stats_update_io_remove(bfqq_group(RQ_BFQQ(rq)),
+					    rq->cmd_flags);
+ 	spin_unlock_irq(&bfqd->lock);
+ 
+ 	return rq;
+@@ -4224,6 +4226,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ {
+ 	struct request_queue *q = hctx->queue;
+ 	struct bfq_data *bfqd = q->elevator->elevator_data;
+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
+ 
+ 	spin_lock_irq(&bfqd->lock);
+ 	if (blk_mq_sched_try_insert_merge(q, rq)) {
+@@ -4243,6 +4246,12 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ 			list_add_tail(&rq->queuelist, &bfqd->dispatch);
+ 	} else {
+ 		__bfq_insert_request(bfqd, rq);
+		/*
+		 * Update bfqq, because, if a queue merge has occurred
+		 * in __bfq_insert_request, then rq has been
+		 * redirected into a new queue.
+		 */
+		bfqq = RQ_BFQQ(rq);
+ 
+ 		if (rq_mergeable(rq)) {
+ 			elv_rqhash_add(q, rq);
+@@ -4251,6 +4260,9 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ 		}
+ 	}
+ 
+	if (bfqq)
+		bfqg_stats_update_io_add(bfqq_group(bfqq), bfqq, rq->cmd_flags);
+
+ 	spin_unlock_irq(&bfqd->lock);
+ }
+ 
+@@ -4428,8 +4440,11 @@ static void bfq_finish_request(struct request *rq)
+ 		 * lock is held.
+ 		 */
+ 
+-		if (!RB_EMPTY_NODE(&rq->rb_node))
+		if (!RB_EMPTY_NODE(&rq->rb_node)) {
+ 			bfq_remove_request(rq->q, rq);
+			bfqg_stats_update_io_remove(bfqq_group(bfqq),
+						    rq->cmd_flags);
+		}
+ 		bfq_put_rq_priv_body(bfqq);
+ 	}
+ 
+-- 
+2.15.1
+
@@ -0,0 +1,41 @@
+From 05e90283561648301e30232fe0c91bd345ceba03 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Wed, 20 Dec 2017 12:38:31 +0100
+Subject: [PATCH] block, bfq: add missing rq_pos_tree update on rq removal
+
+If two processes do I/O close to each other, then BFQ merges the
+bfq_queues associated with these processes, to get a more sequential
+I/O, and thus a higher throughput.  In this respect, to detect whether
+two processes are doing I/O close to each other, BFQ keeps a list of
+the head-of-line I/O requests of all active bfq_queues.  The list is
+ordered by initial sectors, and implemented through a red-black tree
+(rq_pos_tree).
+
+Unfortunately, the update of the rq_pos_tree was incomplete, because
+the tree was not updated on the removal of the head-of-line I/O
+request of a bfq_queue, in case the queue did not remain empty. This
+commit adds the missing update.
+
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 0f48583b9380..fa395a260a23 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -1627,6 +1627,8 @@ static void bfq_remove_request(struct request_queue *q,
+ 			rb_erase(&bfqq->pos_node, bfqq->pos_root);
+ 			bfqq->pos_root = NULL;
+ 		}
+	} else {
+		bfq_pos_tree_add_move(bfqd, bfqq);
+ 	}
+ 
+ 	if (rq->cmd_flags & REQ_META)
+-- 
+2.15.1
+
@@ -0,0 +1,224 @@
+From a7877390614770965a6925dfed79cbd3eeeb61e0 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Wed, 7 Feb 2018 22:19:20 +0100
+Subject: [PATCH] block, bfq: add requeue-request hook
+
+Commit 'a6a252e64914 ("blk-mq-sched: decide how to handle flush rq via
+RQF_FLUSH_SEQ")' makes all non-flush re-prepared requests for a device
+be re-inserted into the active I/O scheduler for that device. As a
+consequence, I/O schedulers may get the same request inserted again,
+even several times, without a finish_request invoked on that request
+before each re-insertion.
+
+This fact is the cause of the failure reported in [1]. For an I/O
+scheduler, every re-insertion of the same re-prepared request is
+equivalent to the insertion of a new request. For schedulers like
+mq-deadline or kyber, this fact causes no harm. In contrast, it
+confuses a stateful scheduler like BFQ, which keeps state for an I/O
+request, until the finish_request hook is invoked on the request. In
+particular, BFQ may get stuck, waiting forever for the number of
+request dispatches, of the same request, to be balanced by an equal
+number of request completions (while there will be one completion for
+that request). In this state, BFQ may refuse to serve I/O requests
+from other bfq_queues. The hang reported in [1] then follows.
+
+However, the above re-prepared requests undergo a requeue, thus the
+requeue_request hook of the active elevator is invoked for these
+requests, if set. This commit then addresses the above issue by
+properly implementing the hook requeue_request in BFQ.
+
+[1] https://marc.info/?l=linux-block&m=151211117608676
+
+Reported-by: Ivan Kozik <ivan@ludios.org>
+Reported-by: Alban Browaeys <alban.browaeys@gmail.com>
+Tested-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Serena Ziviani <ziviani.serena@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 107 ++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 82 insertions(+), 25 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 47e6ec7427c4..aeca22d91101 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -3823,24 +3823,26 @@ static struct request *__bfq_dispatch_request(struct blk_mq_hw_ctx *hctx)
+ 		}
+ 
+ 		/*
+-		 * We exploit the bfq_finish_request hook to decrement
+-		 * rq_in_driver, but bfq_finish_request will not be
+-		 * invoked on this request. So, to avoid unbalance,
+-		 * just start this request, without incrementing
+-		 * rq_in_driver. As a negative consequence,
+-		 * rq_in_driver is deceptively lower than it should be
+-		 * while this request is in service. This may cause
+-		 * bfq_schedule_dispatch to be invoked uselessly.
+		 * We exploit the bfq_finish_requeue_request hook to
+		 * decrement rq_in_driver, but
+		 * bfq_finish_requeue_request will not be invoked on
+		 * this request. So, to avoid unbalance, just start
+		 * this request, without incrementing rq_in_driver. As
+		 * a negative consequence, rq_in_driver is deceptively
+		 * lower than it should be while this request is in
+		 * service. This may cause bfq_schedule_dispatch to be
+		 * invoked uselessly.
+ 		 *
+ 		 * As for implementing an exact solution, the
+-		 * bfq_finish_request hook, if defined, is probably
+-		 * invoked also on this request. So, by exploiting
+-		 * this hook, we could 1) increment rq_in_driver here,
+-		 * and 2) decrement it in bfq_finish_request. Such a
+-		 * solution would let the value of the counter be
+-		 * always accurate, but it would entail using an extra
+-		 * interface function. This cost seems higher than the
+-		 * benefit, being the frequency of non-elevator-private
+		 * bfq_finish_requeue_request hook, if defined, is
+		 * probably invoked also on this request. So, by
+		 * exploiting this hook, we could 1) increment
+		 * rq_in_driver here, and 2) decrement it in
+		 * bfq_finish_requeue_request. Such a solution would
+		 * let the value of the counter be always accurate,
+		 * but it would entail using an extra interface
+		 * function. This cost seems higher than the benefit,
+		 * being the frequency of non-elevator-private
+ 		 * requests very low.
+ 		 */
+ 		goto start_rq;
+@@ -4515,6 +4517,8 @@ static inline void bfq_update_insert_stats(struct request_queue *q,
+ 					   unsigned int cmd_flags) {}
+ #endif
+ 
+static void bfq_prepare_request(struct request *rq, struct bio *bio);
+
+ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ 			       bool at_head)
+ {
+@@ -4541,6 +4545,18 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ 		else
+ 			list_add_tail(&rq->queuelist, &bfqd->dispatch);
+ 	} else {
+		if (WARN_ON_ONCE(!bfqq)) {
+			/*
+			 * This should never happen. Most likely rq is
+			 * a requeued regular request, being
+			 * re-inserted without being first
+			 * re-prepared. Do a prepare, to avoid
+			 * failure.
+			 */
+			bfq_prepare_request(rq, rq->bio);
+			bfqq = RQ_BFQQ(rq);
+		}
+
+ 		idle_timer_disabled = __bfq_insert_request(bfqd, rq);
+ 		/*
+ 		 * Update bfqq, because, if a queue merge has occurred
+@@ -4697,22 +4713,44 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)
+ 		bfq_schedule_dispatch(bfqd);
+ }
+ 
+-static void bfq_finish_request_body(struct bfq_queue *bfqq)
+static void bfq_finish_requeue_request_body(struct bfq_queue *bfqq)
+ {
+ 	bfqq->allocated--;
+ 
+ 	bfq_put_queue(bfqq);
+ }
+ 
+-static void bfq_finish_request(struct request *rq)
+/*
+ * Handle either a requeue or a finish for rq. The things to do are
+ * the same in both cases: all references to rq are to be dropped. In
+ * particular, rq is considered completed from the point of view of
+ * the scheduler.
+ */
+static void bfq_finish_requeue_request(struct request *rq)
+ {
+-	struct bfq_queue *bfqq;
+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
+ 	struct bfq_data *bfqd;
+ 
+-	if (!rq->elv.icq)
+	/*
+	 * Requeue and finish hooks are invoked in blk-mq without
+	 * checking whether the involved request is actually still
+	 * referenced in the scheduler. To handle this fact, the
+	 * following two checks make this function exit in case of
+	 * spurious invocations, for which there is nothing to do.
+	 *
+	 * First, check whether rq has nothing to do with an elevator.
+	 */
+	if (unlikely(!(rq->rq_flags & RQF_ELVPRIV)))
+		return;
+
+	/*
+	 * rq either is not associated with any icq, or is an already
+	 * requeued request that has not (yet) been re-inserted into
+	 * a bfq_queue.
+	 */
+	if (!rq->elv.icq || !bfqq)
+ 		return;
+ 
+-	bfqq = RQ_BFQQ(rq);
+ 	bfqd = bfqq->bfqd;
+ 
+ 	if (rq->rq_flags & RQF_STARTED)
+@@ -4727,13 +4765,14 @@ static void bfq_finish_request(struct request *rq)
+ 		spin_lock_irqsave(&bfqd->lock, flags);
+ 
+ 		bfq_completed_request(bfqq, bfqd);
+-		bfq_finish_request_body(bfqq);
+		bfq_finish_requeue_request_body(bfqq);
+ 
+ 		spin_unlock_irqrestore(&bfqd->lock, flags);
+ 	} else {
+ 		/*
+ 		 * Request rq may be still/already in the scheduler,
+-		 * in which case we need to remove it. And we cannot
+		 * in which case we need to remove it (this should
+		 * never happen in case of requeue). And we cannot
+ 		 * defer such a check and removal, to avoid
+ 		 * inconsistencies in the time interval from the end
+ 		 * of this function to the start of the deferred work.
+@@ -4748,9 +4787,26 @@ static void bfq_finish_request(struct request *rq)
+ 			bfqg_stats_update_io_remove(bfqq_group(bfqq),
+ 						    rq->cmd_flags);
+ 		}
+-		bfq_finish_request_body(bfqq);
+		bfq_finish_requeue_request_body(bfqq);
+ 	}
+ 
+	/*
+	 * Reset private fields. In case of a requeue, this allows
+	 * this function to correctly do nothing if it is spuriously
+	 * invoked again on this same request (see the check at the
+	 * beginning of the function). Probably, a better general
+	 * design would be to prevent blk-mq from invoking the requeue
+	 * or finish hooks of an elevator, for a request that is not
+	 * referred by that elevator.
+	 *
+	 * Resetting the following fields would break the
+	 * request-insertion logic if rq is re-inserted into a bfq
+	 * internal queue, without a re-preparation. Here we assume
+	 * that re-insertions of requeued requests, without
+	 * re-preparation, can happen only for pass_through or at_head
+	 * requests (which are not re-inserted into bfq internal
+	 * queues).
+	 */
+ 	rq->elv.priv[0] = NULL;
+ 	rq->elv.priv[1] = NULL;
+ }
+@@ -5426,7 +5482,8 @@ static struct elevator_type iosched_bfq_mq = {
+ 	.ops.mq = {
+ 		.limit_depth		= bfq_limit_depth,
+ 		.prepare_request	= bfq_prepare_request,
+-		.finish_request		= bfq_finish_request,
+		.requeue_request        = bfq_finish_requeue_request,
+		.finish_request		= bfq_finish_requeue_request,
+ 		.exit_icq		= bfq_exit_icq,
+ 		.insert_requests	= bfq_insert_requests,
+ 		.dispatch_request	= bfq_dispatch_request,
+-- 
+2.16.1
+
@@ -0,0 +1,163 @@
+From 3e2bdd6dff239afd8386e8758eee69ad61e5a3d6 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Thu, 21 Sep 2017 11:04:01 +0200
+Subject: [PATCH] block, bfq: check and switch back to interactive wr also on
+ queue split
+
+As already explained in the message of commit "block, bfq: fix
+wrong init of saved start time for weight raising", if a soft
+real-time weight-raising period happens to be nested in a larger
+interactive weight-raising period, then BFQ restores the interactive
+weight raising at the end of the soft real-time weight raising. In
+particular, BFQ checks whether the latter has ended only on request
+dispatches.
+
+Unfortunately, the above scheme fails to restore interactive weight
+raising in the following corner case: if a bfq_queue, say Q,
+1) Is merged with another bfq_queue while it is in a nested soft
+real-time weight-raising period. The weight-raising state of Q is
+then saved, and not considered any longer until a split occurs.
+2) Is split from the other bfq_queue(s) at a time instant when its
+soft real-time weight raising is already finished.
+On the split, while resuming the previous, soft real-time
+weight-raised state of the bfq_queue Q, BFQ checks whether the
+current soft real-time weight-raising period is actually over. If so,
+BFQ switches weight raising off for Q, *without* checking whether the
+soft real-time period was actually nested in a non-yet-finished
+interactive weight-raising period.
+
+This commit addresses this issue by adding the above missing check in
+bfq_queue splits, and restoring interactive weight raising if needed.
+
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Tested-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Tested-by: Mirko Montanari <mirkomontanari91@gmail.com>
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 87 ++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 49 insertions(+), 38 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index c25955c25e03..33b63bc4a64b 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -724,6 +724,44 @@ static void bfq_updated_next_req(struct bfq_data *bfqd,
+ 	}
+ }
+ 
+static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
+{
+	u64 dur;
+
+	if (bfqd->bfq_wr_max_time > 0)
+		return bfqd->bfq_wr_max_time;
+
+	dur = bfqd->RT_prod;
+	do_div(dur, bfqd->peak_rate);
+
+	/*
+	 * Limit duration between 3 and 13 seconds. Tests show that
+	 * higher values than 13 seconds often yield the opposite of
+	 * the desired result, i.e., worsen responsiveness by letting
+	 * non-interactive and non-soft-real-time applications
+	 * preserve weight raising for a too long time interval.
+	 *
+	 * On the other end, lower values than 3 seconds make it
+	 * difficult for most interactive tasks to complete their jobs
+	 * before weight-raising finishes.
+	 */
+	if (dur > msecs_to_jiffies(13000))
+		dur = msecs_to_jiffies(13000);
+	else if (dur < msecs_to_jiffies(3000))
+		dur = msecs_to_jiffies(3000);
+
+	return dur;
+}
+
+/* switch back from soft real-time to interactive weight raising */
+static void switch_back_to_interactive_wr(struct bfq_queue *bfqq,
+					  struct bfq_data *bfqd)
+{
+	bfqq->wr_coeff = bfqd->bfq_wr_coeff;
+	bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
+	bfqq->last_wr_start_finish = bfqq->wr_start_at_switch_to_srt;
+}
+
+ static void
+ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd,
+ 		      struct bfq_io_cq *bic, bool bfq_already_existing)
+@@ -750,10 +788,16 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd,
+ 	if (bfqq->wr_coeff > 1 && (bfq_bfqq_in_large_burst(bfqq) ||
+ 	    time_is_before_jiffies(bfqq->last_wr_start_finish +
+ 				   bfqq->wr_cur_max_time))) {
+-		bfq_log_bfqq(bfqq->bfqd, bfqq,
+-		    "resume state: switching off wr");
+-
+-		bfqq->wr_coeff = 1;
+		if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time &&
+		    !bfq_bfqq_in_large_burst(bfqq) &&
+		    time_is_after_eq_jiffies(bfqq->wr_start_at_switch_to_srt +
+					     bfq_wr_duration(bfqd))) {
+			switch_back_to_interactive_wr(bfqq, bfqd);
+		} else {
+			bfqq->wr_coeff = 1;
+			bfq_log_bfqq(bfqq->bfqd, bfqq,
+				     "resume state: switching off wr");
+		}
+ 	}
+ 
+ 	/* make sure weight will be updated, however we got here */
+@@ -1173,35 +1217,6 @@ static bool bfq_bfqq_update_budg_for_activation(struct bfq_data *bfqd,
+ 	return wr_or_deserves_wr;
+ }
+ 
+-static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
+-{
+-	u64 dur;
+-
+-	if (bfqd->bfq_wr_max_time > 0)
+-		return bfqd->bfq_wr_max_time;
+-
+-	dur = bfqd->RT_prod;
+-	do_div(dur, bfqd->peak_rate);
+-
+-	/*
+-	 * Limit duration between 3 and 13 seconds. Tests show that
+-	 * higher values than 13 seconds often yield the opposite of
+-	 * the desired result, i.e., worsen responsiveness by letting
+-	 * non-interactive and non-soft-real-time applications
+-	 * preserve weight raising for a too long time interval.
+-	 *
+-	 * On the other end, lower values than 3 seconds make it
+-	 * difficult for most interactive tasks to complete their jobs
+-	 * before weight-raising finishes.
+-	 */
+-	if (dur > msecs_to_jiffies(13000))
+-		dur = msecs_to_jiffies(13000);
+-	else if (dur < msecs_to_jiffies(3000))
+-		dur = msecs_to_jiffies(3000);
+-
+-	return dur;
+-}
+-
+ /*
+  * Return the farthest future time instant according to jiffies
+  * macros.
+@@ -3501,11 +3516,7 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
+ 					       bfq_wr_duration(bfqd)))
+ 				bfq_bfqq_end_wr(bfqq);
+ 			else {
+-				/* switch back to interactive wr */
+-				bfqq->wr_coeff = bfqd->bfq_wr_coeff;
+-				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
+-				bfqq->last_wr_start_finish =
+-					bfqq->wr_start_at_switch_to_srt;
+				switch_back_to_interactive_wr(bfqq, bfqd);
+ 				bfqq->entity.prio_changed = 1;
+ 			}
+ 		}
+-- 
+2.15.1
+
@@ -0,0 +1,48 @@
+From 1be6e8a964ee9aa8d4daac523ce29e5f486dd756 Mon Sep 17 00:00:00 2001
+From: Angelo Ruocco <angeloruocco90@gmail.com>
+Date: Wed, 20 Dec 2017 12:38:32 +0100
+Subject: [PATCH] block, bfq: check low_latency flag in bfq_bfqq_save_state()
+
+A just-created bfq_queue will certainly be deemed as interactive on
+the arrival of its first I/O request, if the low_latency flag is
+set. Yet, if the queue is merged with another queue on the arrival of
+its first I/O request, it will not have the chance to be flagged as
+interactive. Nevertheless, if the queue is then split soon enough, it
+has to be flagged as interactive after the split.
+
+To handle this early-merge scenario correctly, BFQ saves the state of
+the queue, on the merge, as if the latter had already been deemed
+interactive. So, if the queue is split soon, it will get
+weight-raised, because the previous state of the queue is resumed on
+the split.
+
+Unfortunately, in the act of saving the state of the newly-created
+queue, BFQ doesn't check whether the low_latency flag is set, and this
+causes early-merged queues to be then weight-raised, on queue splits,
+even if low_latency is off. This commit addresses this problem by
+adding the missing check.
+
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index fa395a260a23..2cf395daee80 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -2064,7 +2064,8 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
+ 	bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
+ 	bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
+ 	if (unlikely(bfq_bfqq_just_created(bfqq) &&
+-		     !bfq_bfqq_in_large_burst(bfqq))) {
+		     !bfq_bfqq_in_large_burst(bfqq) &&
+		     bfqq->bfqd->low_latency)) {
+ 		/*
+ 		 * bfqq being merged right after being created: bfqq
+ 		 * would have deserved interactive weight raising, but
+-- 
+2.15.1
+
@@ -0,0 +1,206 @@
+From a34b024448eb71b0e51ad011fa1862236e366034 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Fri, 15 Dec 2017 07:23:12 +0100
+Subject: [PATCH] block, bfq: consider also past I/O in soft real-time
+ detection
+
+BFQ privileges the I/O of soft real-time applications, such as video
+players, to guarantee to these application a high bandwidth and a low
+latency. In this respect, it is not easy to correctly detect when an
+application is soft real-time. A particularly nasty false positive is
+that of an I/O-bound application that occasionally happens to meet all
+requirements to be deemed as soft real-time. After being detected as
+soft real-time, such an application monopolizes the device. Fortunately,
+BFQ will realize soon that the application is actually not soft
+real-time and suspend every privilege. Yet, the application may happen
+again to be wrongly detected as soft real-time, and so on.
+
+As highlighted by our tests, this problem causes BFQ to occasionally
+fail to guarantee a high responsiveness, in the presence of heavy
+background I/O workloads. The reason is that the background workload
+happens to be detected as soft real-time, more or less frequently,
+during the execution of the interactive task under test. To give an
+idea, because of this problem, Libreoffice Writer occasionally takes 8
+seconds, instead of 3, to start up, if there are sequential reads and
+writes in the background, on a Kingston SSDNow V300.
+
+This commit addresses this issue by leveraging the following facts.
+
+The reason why some applications are detected as soft real-time despite
+all BFQ checks to avoid false positives, is simply that, during high
+CPU or storage-device load, I/O-bound applications may happen to do
+I/O slowly enough to meet all soft real-time requirements, and pass
+all BFQ extra checks. Yet, this happens only for limited time periods:
+slow-speed time intervals are usually interspersed between other time
+intervals during which these applications do I/O at a very high speed.
+To exploit these facts, this commit introduces a little change, in the
+detection of soft real-time behavior, to systematically consider also
+the recent past: the higher the speed was in the recent past, the
+later next I/O should arrive for the application to be considered as
+soft real-time. At the beginning of a slow-speed interval, the minimum
+arrival time allowed for the next I/O usually happens to still be so
+high, to fall *after* the end of the slow-speed period itself. As a
+consequence, the application does not risk to be deemed as soft
+real-time during the slow-speed interval. Then, during the next
+high-speed interval, the application cannot, evidently, be deemed as
+soft real-time (exactly because of its speed), and so on.
+
+This extra filtering proved to be rather effective: in the above test,
+the frequency of false positives became so low that the start-up time
+was 3 seconds in all iterations (apart from occasional outliers,
+caused by page-cache-management issues, which are out of the scope of
+this commit, and cannot be solved by an I/O scheduler).
+
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 115 ++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 81 insertions(+), 34 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 9625550b2f85..e33c5c4c9856 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -2940,45 +2940,87 @@ static bool bfq_bfqq_is_slow(struct bfq_data *bfqd, struct bfq_queue *bfqq,
+  * whereas soft_rt_next_start is set to infinity for applications that do
+  * not.
+  *
+- * Unfortunately, even a greedy application may happen to behave in an
+- * isochronous way if the CPU load is high. In fact, the application may
+- * stop issuing requests while the CPUs are busy serving other processes,
+- * then restart, then stop again for a while, and so on. In addition, if
+- * the disk achieves a low enough throughput with the request pattern
+- * issued by the application (e.g., because the request pattern is random
+- * and/or the device is slow), then the application may meet the above
+- * bandwidth requirement too. To prevent such a greedy application to be
+- * deemed as soft real-time, a further rule is used in the computation of
+- * soft_rt_next_start: soft_rt_next_start must be higher than the current
+- * time plus the maximum time for which the arrival of a request is waited
+- * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle.
+- * This filters out greedy applications, as the latter issue instead their
+- * next request as soon as possible after the last one has been completed
+- * (in contrast, when a batch of requests is completed, a soft real-time
+- * application spends some time processing data).
+ * Unfortunately, even a greedy (i.e., I/O-bound) application may
+ * happen to meet, occasionally or systematically, both the above
+ * bandwidth and isochrony requirements. This may happen at least in
+ * the following circumstances. First, if the CPU load is high. The
+ * application may stop issuing requests while the CPUs are busy
+ * serving other processes, then restart, then stop again for a while,
+ * and so on. The other circumstances are related to the storage
+ * device: the storage device is highly loaded or reaches a low-enough
+ * throughput with the I/O of the application (e.g., because the I/O
+ * is random and/or the device is slow). In all these cases, the
+ * I/O of the application may be simply slowed down enough to meet
+ * the bandwidth and isochrony requirements. To reduce the probability
+ * that greedy applications are deemed as soft real-time in these
+ * corner cases, a further rule is used in the computation of
+ * soft_rt_next_start: the return value of this function is forced to
+ * be higher than the maximum between the following two quantities.
+  *
+- * Unfortunately, the last filter may easily generate false positives if
+- * only bfqd->bfq_slice_idle is used as a reference time interval and one
+- * or both the following cases occur:
+- * 1) HZ is so low that the duration of a jiffy is comparable to or higher
+- *    than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with
+- *    HZ=100.
+ * (a) Current time plus: (1) the maximum time for which the arrival
+ *     of a request is waited for when a sync queue becomes idle,
+ *     namely bfqd->bfq_slice_idle, and (2) a few extra jiffies. We
+ *     postpone for a moment the reason for adding a few extra
+ *     jiffies; we get back to it after next item (b).  Lower-bounding
+ *     the return value of this function with the current time plus
+ *     bfqd->bfq_slice_idle tends to filter out greedy applications,
+ *     because the latter issue their next request as soon as possible
+ *     after the last one has been completed. In contrast, a soft
+ *     real-time application spends some time processing data, after a
+ *     batch of its requests has been completed.
+ *
+ * (b) Current value of bfqq->soft_rt_next_start. As pointed out
+ *     above, greedy applications may happen to meet both the
+ *     bandwidth and isochrony requirements under heavy CPU or
+ *     storage-device load. In more detail, in these scenarios, these
+ *     applications happen, only for limited time periods, to do I/O
+ *     slowly enough to meet all the requirements described so far,
+ *     including the filtering in above item (a). These slow-speed
+ *     time intervals are usually interspersed between other time
+ *     intervals during which these applications do I/O at a very high
+ *     speed. Fortunately, exactly because of the high speed of the
+ *     I/O in the high-speed intervals, the values returned by this
+ *     function happen to be so high, near the end of any such
+ *     high-speed interval, to be likely to fall *after* the end of
+ *     the low-speed time interval that follows. These high values are
+ *     stored in bfqq->soft_rt_next_start after each invocation of
+ *     this function. As a consequence, if the last value of
+ *     bfqq->soft_rt_next_start is constantly used to lower-bound the
+ *     next value that this function may return, then, from the very
+ *     beginning of a low-speed interval, bfqq->soft_rt_next_start is
+ *     likely to be constantly kept so high that any I/O request
+ *     issued during the low-speed interval is considered as arriving
+ *     to soon for the application to be deemed as soft
+ *     real-time. Then, in the high-speed interval that follows, the
+ *     application will not be deemed as soft real-time, just because
+ *     it will do I/O at a high speed. And so on.
+ *
+ * Getting back to the filtering in item (a), in the following two
+ * cases this filtering might be easily passed by a greedy
+ * application, if the reference quantity was just
+ * bfqd->bfq_slice_idle:
+ * 1) HZ is so low that the duration of a jiffy is comparable to or
+ *    higher than bfqd->bfq_slice_idle. This happens, e.g., on slow
+ *    devices with HZ=100. The time granularity may be so coarse
+ *    that the approximation, in jiffies, of bfqd->bfq_slice_idle
+ *    is rather lower than the exact value.
+  * 2) jiffies, instead of increasing at a constant rate, may stop increasing
+  *    for a while, then suddenly 'jump' by several units to recover the lost
+  *    increments. This seems to happen, e.g., inside virtual machines.
+- * To address this issue, we do not use as a reference time interval just
+- * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In
+- * particular we add the minimum number of jiffies for which the filter
+- * seems to be quite precise also in embedded systems and KVM/QEMU virtual
+- * machines.
+ * To address this issue, in the filtering in (a) we do not use as a
+ * reference time interval just bfqd->bfq_slice_idle, but
+ * bfqd->bfq_slice_idle plus a few jiffies. In particular, we add the
+ * minimum number of jiffies for which the filter seems to be quite
+ * precise also in embedded systems and KVM/QEMU virtual machines.
+  */
+ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
+ 						struct bfq_queue *bfqq)
+ {
+-	return max(bfqq->last_idle_bklogged +
+-		   HZ * bfqq->service_from_backlogged /
+-		   bfqd->bfq_wr_max_softrt_rate,
+-		   jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4);
+	return max3(bfqq->soft_rt_next_start,
+		    bfqq->last_idle_bklogged +
+		    HZ * bfqq->service_from_backlogged /
+		    bfqd->bfq_wr_max_softrt_rate,
+		    jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4);
+ }
+ 
+ /**
+@@ -4014,10 +4056,15 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
+ 	bfqq->split_time = bfq_smallest_from_now();
+ 
+ 	/*
+-	 * Set to the value for which bfqq will not be deemed as
+-	 * soft rt when it becomes backlogged.
+	 * To not forget the possibly high bandwidth consumed by a
+	 * process/queue in the recent past,
+	 * bfq_bfqq_softrt_next_start() returns a value at least equal
+	 * to the current value of bfqq->soft_rt_next_start (see
+	 * comments on bfq_bfqq_softrt_next_start).  Set
+	 * soft_rt_next_start to now, to mean that bfqq has consumed
+	 * no bandwidth so far.
+ 	 */
+-	bfqq->soft_rt_next_start = bfq_greatest_from_now();
+	bfqq->soft_rt_next_start = jiffies;
+ 
+ 	/* first request is almost certainly seeky */
+ 	bfqq->seek_history = 1;
+-- 
+2.15.1
+
@@ -0,0 +1,82 @@
+From 7cb04004fa371a626c1a5ebe6d977f70285759ed Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Thu, 21 Sep 2017 11:04:03 +0200
+Subject: [PATCH] block, bfq: decrease burst size when queues in burst exit
+
+If many queues belonging to the same group happen to be created
+shortly after each other, then the concurrent processes associated
+with these queues have typically a common goal, and they get it done
+as soon as possible if not hampered by device idling.  Examples are
+processes spawned by git grep, or by systemd during boot. As for
+device idling, this mechanism is currently necessary for weight
+raising to succeed in its goal: privileging I/O.  In view of these
+facts, BFQ does not provide the above queues with either weight
+raising or device idling.
+
+On the other hand, a burst of queue creations may be caused also by
+the start-up of a complex application. In this case, these queues need
+usually to be served one after the other, and as quickly as possible,
+to maximise responsiveness. Therefore, in this case the best strategy
+is to weight-raise all the queues created during the burst, i.e., the
+exact opposite of the strategy for the above case.
+
+To distinguish between the two cases, BFQ uses an empirical burst-size
+threshold, found through extensive tests and monitoring of daily
+usage. Only large bursts, i.e., burst with a size above this
+threshold, are considered as generated by a high number of parallel
+processes. In this respect, upstart-based boot proved to be rather
+hard to detect as generating a large burst of queue creations, because
+with upstart most of the queues created in a burst exit *before* the
+next queues in the same burst are created. To address this issue, I
+changed the burst-detection mechanism so as to not decrease the size
+of the current burst even if one of the queues in the burst is
+eliminated.
+
+Unfortunately, this missing decrease causes false positives on very
+fast systems: on the start-up of a complex application, such as
+libreoffice writer, so many queues are created, served and exited
+shortly after each other, that a large burst of queue creations is
+wrongly detected as occurring. These false positives just disappear if
+the size of a burst is decreased when one of the queues in the burst
+exits. This commit restores the missing burst-size decrease, relying
+of the fact that upstart is apparently unlikely to be used on systems
+running this and future versions of the kernel.
+
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Mauro Andreolini <mauro.andreolini@unimore.it>
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Tested-by: Mirko Montanari <mirkomontanari91@gmail.com>
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 115747fe43c8..70f9177c4f5b 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -3725,16 +3725,10 @@ void bfq_put_queue(struct bfq_queue *bfqq)
+ 	if (bfqq->ref)
+ 		return;
+ 
+-	if (bfq_bfqq_sync(bfqq))
+-		/*
+-		 * The fact that this queue is being destroyed does not
+-		 * invalidate the fact that this queue may have been
+-		 * activated during the current burst. As a consequence,
+-		 * although the queue does not exist anymore, and hence
+-		 * needs to be removed from the burst list if there,
+-		 * the burst size has not to be decremented.
+-		 */
+	if (bfq_bfqq_sync(bfqq) && !hlist_unhashed(&bfqq->burst_list_node)) {
+ 		hlist_del_init(&bfqq->burst_list_node);
+		bfqq->bfqd->burst_size--;
+	}
+ 
+ 	kmem_cache_free(bfq_pool, bfqq);
+ #ifdef CONFIG_BFQ_GROUP_IOSCHED
+-- 
+2.15.1
+
@@ -0,0 +1,91 @@
+From 8993d445df388e3541f48920a2353cfc904b220a Mon Sep 17 00:00:00 2001
+From: Chiara Bruschi <bruschi.chiara@outlook.it>
+Date: Mon, 18 Dec 2017 16:21:59 +0000
+Subject: [PATCH] block, bfq: fix occurrences of request finish method's old
+ name
+
+Commit '7b9e93616399' ("blk-mq-sched: unify request finished methods")
+changed the old name of current bfq_finish_request method, but left it
+unchanged elsewhere in the code (related comments, part of function
+name bfq_put_rq_priv_body).
+
+This commit fixes all occurrences of the old name of this method by
+changing them into the current name.
+
+Fixes: 7b9e93616399 ("blk-mq-sched: unify request finished methods")
+Reviewed-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Federico Motta <federico@willer.it>
+Signed-off-by: Chiara Bruschi <bruschi.chiara@outlook.it>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 5e6f837f663e..f352b1677143 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -3684,8 +3684,8 @@ static struct request *__bfq_dispatch_request(struct blk_mq_hw_ctx *hctx)
+ 		}
+ 
+ 		/*
+-		 * We exploit the put_rq_private hook to decrement
+-		 * rq_in_driver, but put_rq_private will not be
+		 * We exploit the bfq_finish_request hook to decrement
+		 * rq_in_driver, but bfq_finish_request will not be
+ 		 * invoked on this request. So, to avoid unbalance,
+ 		 * just start this request, without incrementing
+ 		 * rq_in_driver. As a negative consequence,
+@@ -3694,14 +3694,14 @@ static struct request *__bfq_dispatch_request(struct blk_mq_hw_ctx *hctx)
+ 		 * bfq_schedule_dispatch to be invoked uselessly.
+ 		 *
+ 		 * As for implementing an exact solution, the
+-		 * put_request hook, if defined, is probably invoked
+-		 * also on this request. So, by exploiting this hook,
+-		 * we could 1) increment rq_in_driver here, and 2)
+-		 * decrement it in put_request. Such a solution would
+-		 * let the value of the counter be always accurate,
+-		 * but it would entail using an extra interface
+-		 * function. This cost seems higher than the benefit,
+-		 * being the frequency of non-elevator-private
+		 * bfq_finish_request hook, if defined, is probably
+		 * invoked also on this request. So, by exploiting
+		 * this hook, we could 1) increment rq_in_driver here,
+		 * and 2) decrement it in bfq_finish_request. Such a
+		 * solution would let the value of the counter be
+		 * always accurate, but it would entail using an extra
+		 * interface function. This cost seems higher than the
+		 * benefit, being the frequency of non-elevator-private
+ 		 * requests very low.
+ 		 */
+ 		goto start_rq;
+@@ -4558,7 +4558,7 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)
+ 		bfq_schedule_dispatch(bfqd);
+ }
+ 
+-static void bfq_put_rq_priv_body(struct bfq_queue *bfqq)
+static void bfq_finish_request_body(struct bfq_queue *bfqq)
+ {
+ 	bfqq->allocated--;
+ 
+@@ -4588,7 +4588,7 @@ static void bfq_finish_request(struct request *rq)
+ 		spin_lock_irqsave(&bfqd->lock, flags);
+ 
+ 		bfq_completed_request(bfqq, bfqd);
+-		bfq_put_rq_priv_body(bfqq);
+		bfq_finish_request_body(bfqq);
+ 
+ 		spin_unlock_irqrestore(&bfqd->lock, flags);
+ 	} else {
+@@ -4609,7 +4609,7 @@ static void bfq_finish_request(struct request *rq)
+ 			bfqg_stats_update_io_remove(bfqq_group(bfqq),
+ 						    rq->cmd_flags);
+ 		}
+-		bfq_put_rq_priv_body(bfqq);
+		bfq_finish_request_body(bfqq);
+ 	}
+ 
+ 	rq->elv.priv[0] = NULL;
+-- 
+2.16.1
+
@@ -0,0 +1,141 @@
+From 99fead8d38e5302b1be9403d4de815ce9174a3df Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Mon, 9 Oct 2017 13:11:23 +0200
+Subject: [PATCH] block, bfq: fix unbalanced decrements of burst size
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The commit "block, bfq: decrease burst size when queues in burst
+exit" introduced the decrement of burst_size on the removal of a
+bfq_queue from the burst list. Unfortunately, this decrement can
+happen to be performed even when burst size is already equal to 0,
+because of unbalanced decrements. A description follows of the cause
+of these unbalanced decrements, namely a wrong assumption, and of the
+way how this wrong assumption leads to unbalanced decrements.
+
+The wrong assumption is that a bfq_queue can exit only if the process
+associated with the bfq_queue has exited. This is false, because a
+bfq_queue, say Q, may exit also as a consequence of a merge with
+another bfq_queue. In this case, Q exits because the I/O of its
+associated process has been redirected to another bfq_queue.
+
+The decrement unbalance occurs because Q may then be re-created after
+a split, and added back to the current burst list, *without*
+incrementing burst_size. burst_size is not incremented because Q is
+not a new bfq_queue added to the burst list, but a bfq_queue only
+temporarily removed from the list, and, before the commit "bfq-sq,
+bfq-mq: decrease burst size when queues in burst exit", burst_size was
+not decremented when Q was removed.
+
+This commit addresses this issue by just checking whether the exiting
+bfq_queue is a merged bfq_queue, and, in that case, not decrementing
+burst_size. Unfortunately, this still leaves room for unbalanced
+decrements, in the following rarer case: on a split, the bfq_queue
+happens to be inserted into a different burst list than that it was
+removed from when merged. If this happens, the number of elements in
+the new burst list becomes higher than burst_size (by one). When the
+bfq_queue then exits, it is of course not in a merged state any
+longer, thus burst_size is decremented, which results in an unbalanced
+decrement.  To handle this sporadic, unlucky case in a simple way,
+this commit also checks that burst_size is larger than 0 before
+decrementing it.
+
+Finally, this commit removes an useless, extra check: the check that
+the bfq_queue is sync, performed before checking whether the bfq_queue
+is in the burst list. This extra check is redundant, because only sync
+bfq_queues can be inserted into the burst list.
+
+Fixes: 7cb04004fa37 ("block, bfq: decrease burst size when queues in burst exit")
+Reported-by: Philip Müller <philm@manjaro.org>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Tested-by: Philip Müller <philm@manjaro.org>
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 57 insertions(+), 2 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 261f98695910..889a8549d97f 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -3726,9 +3726,36 @@ void bfq_put_queue(struct bfq_queue *bfqq)
+ 	if (bfqq->ref)
+ 		return;
+ 
+-	if (bfq_bfqq_sync(bfqq) && !hlist_unhashed(&bfqq->burst_list_node)) {
+	if (!hlist_unhashed(&bfqq->burst_list_node)) {
+ 		hlist_del_init(&bfqq->burst_list_node);
+-		bfqq->bfqd->burst_size--;
+		/*
+		 * Decrement also burst size after the removal, if the
+		 * process associated with bfqq is exiting, and thus
+		 * does not contribute to the burst any longer. This
+		 * decrement helps filter out false positives of large
+		 * bursts, when some short-lived process (often due to
+		 * the execution of commands by some service) happens
+		 * to start and exit while a complex application is
+		 * starting, and thus spawning several processes that
+		 * do I/O (and that *must not* be treated as a large
+		 * burst, see comments on bfq_handle_burst).
+		 *
+		 * In particular, the decrement is performed only if:
+		 * 1) bfqq is not a merged queue, because, if it is,
+		 * then this free of bfqq is not triggered by the exit
+		 * of the process bfqq is associated with, but exactly
+		 * by the fact that bfqq has just been merged.
+		 * 2) burst_size is greater than 0, to handle
+		 * unbalanced decrements. Unbalanced decrements may
+		 * happen in te following case: bfqq is inserted into
+		 * the current burst list--without incrementing
+		 * bust_size--because of a split, but the current
+		 * burst list is not the burst list bfqq belonged to
+		 * (see comments on the case of a split in
+		 * bfq_set_request).
+		 */
+		if (bfqq->bic && bfqq->bfqd->burst_size > 0)
+			bfqq->bfqd->burst_size--;
+ 	}
+ 
+ 	kmem_cache_free(bfq_pool, bfqq);
+@@ -4460,6 +4487,34 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
+ 		else {
+ 			bfq_clear_bfqq_in_large_burst(bfqq);
+ 			if (bic->was_in_burst_list)
+				/*
+				 * If bfqq was in the current
+				 * burst list before being
+				 * merged, then we have to add
+				 * it back. And we do not need
+				 * to increase burst_size, as
+				 * we did not decrement
+				 * burst_size when we removed
+				 * bfqq from the burst list as
+				 * a consequence of a merge
+				 * (see comments in
+				 * bfq_put_queue). In this
+				 * respect, it would be rather
+				 * costly to know whether the
+				 * current burst list is still
+				 * the same burst list from
+				 * which bfqq was removed on
+				 * the merge. To avoid this
+				 * cost, if bfqq was in a
+				 * burst list, then we add
+				 * bfqq to the current burst
+				 * list without any further
+				 * check. This can cause
+				 * inappropriate insertions,
+				 * but rarely enough to not
+				 * harm the detection of large
+				 * bursts significantly.
+				 */
+ 				hlist_add_head(&bfqq->burst_list_node,
+ 					       &bfqd->burst_list);
+ 		}
+-- 
+2.15.1
+
@@ -0,0 +1,146 @@
+From 4baa8bb13f41307f3eb62fe91f93a1a798ebef53 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Thu, 21 Sep 2017 11:04:00 +0200
+Subject: [PATCH] block, bfq: fix wrong init of saved start time for weight
+ raising
+
+This commit fixes a bug that causes bfq to fail to guarantee a high
+responsiveness on some drives, if there is heavy random read+write I/O
+in the background. More precisely, such a failure allowed this bug to
+be found [1], but the bug may well cause other yet unreported
+anomalies.
+
+BFQ raises the weight of the bfq_queues associated with soft real-time
+applications, to privilege the I/O, and thus reduce latency, for these
+applications. This mechanism is named soft-real-time weight raising in
+BFQ. A soft real-time period may happen to be nested into an
+interactive weight raising period, i.e., it may happen that, when a
+bfq_queue switches to a soft real-time weight-raised state, the
+bfq_queue is already being weight-raised because deemed interactive
+too. In this case, BFQ saves in a special variable
+wr_start_at_switch_to_srt, the time instant when the interactive
+weight-raising period started for the bfq_queue, i.e., the time
+instant when BFQ started to deem the bfq_queue interactive. This value
+is then used to check whether the interactive weight-raising period
+would still be in progress when the soft real-time weight-raising
+period ends.  If so, interactive weight raising is restored for the
+bfq_queue. This restore is useful, in particular, because it prevents
+bfq_queues from losing their interactive weight raising prematurely,
+as a consequence of spurious, short-lived soft real-time
+weight-raising periods caused by wrong detections as soft real-time.
+
+If, instead, a bfq_queue switches to soft-real-time weight raising
+while it *is not* already in an interactive weight-raising period,
+then the variable wr_start_at_switch_to_srt has no meaning during the
+following soft real-time weight-raising period. Unfortunately the
+handling of this case is wrong in BFQ: not only the variable is not
+flagged somehow as meaningless, but it is also set to the time when
+the switch to soft real-time weight-raising occurs. This may cause an
+interactive weight-raising period to be considered mistakenly as still
+in progress, and thus a spurious interactive weight-raising period to
+start for the bfq_queue, at the end of the soft-real-time
+weight-raising period. In particular the spurious interactive
+weight-raising period will be considered as still in progress, if the
+soft-real-time weight-raising period does not last very long. The
+bfq_queue will then be wrongly privileged and, if I/O bound, will
+unjustly steal bandwidth to truly interactive or soft real-time
+bfq_queues, harming responsiveness and low latency.
+
+This commit fixes this issue by just setting wr_start_at_switch_to_srt
+to minus infinity (farthest past time instant according to jiffies
+macros): when the soft-real-time weight-raising period ends, certainly
+no interactive weight-raising period will be considered as still in
+progress.
+
+[1] Background I/O Type: Random - Background I/O mix: Reads and writes
+- Application to start: LibreOffice Writer in
+http://www.phoronix.com/scan.php?page=news_item&px=Linux-4.13-IO-Laptop
+
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Tested-by: Lee Tibbert <lee.tibbert@gmail.com>
+Tested-by: Mirko Montanari <mirkomontanari91@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 50 +++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 31 insertions(+), 19 deletions(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index a4783da90ba8..c25955c25e03 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -1202,6 +1202,24 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
+ 	return dur;
+ }
+ 
+/*
+ * Return the farthest future time instant according to jiffies
+ * macros.
+ */
+static unsigned long bfq_greatest_from_now(void)
+{
+	return jiffies + MAX_JIFFY_OFFSET;
+}
+
+/*
+ * Return the farthest past time instant according to jiffies
+ * macros.
+ */
+static unsigned long bfq_smallest_from_now(void)
+{
+	return jiffies - MAX_JIFFY_OFFSET;
+}
+
+ static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd,
+ 					     struct bfq_queue *bfqq,
+ 					     unsigned int old_wr_coeff,
+@@ -1216,7 +1234,19 @@ static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd,
+ 			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
+ 			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
+ 		} else {
+-			bfqq->wr_start_at_switch_to_srt = jiffies;
+			/*
+			 * No interactive weight raising in progress
+			 * here: assign minus infinity to
+			 * wr_start_at_switch_to_srt, to make sure
+			 * that, at the end of the soft-real-time
+			 * weight raising periods that is starting
+			 * now, no interactive weight-raising period
+			 * may be wrongly considered as still in
+			 * progress (and thus actually started by
+			 * mistake).
+			 */
+			bfqq->wr_start_at_switch_to_srt =
+				bfq_smallest_from_now();
+ 			bfqq->wr_coeff = bfqd->bfq_wr_coeff *
+ 				BFQ_SOFTRT_WEIGHT_FACTOR;
+ 			bfqq->wr_cur_max_time =
+@@ -2897,24 +2927,6 @@ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
+ 		   jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4);
+ }
+ 
+-/*
+- * Return the farthest future time instant according to jiffies
+- * macros.
+- */
+-static unsigned long bfq_greatest_from_now(void)
+-{
+-	return jiffies + MAX_JIFFY_OFFSET;
+-}
+-
+-/*
+- * Return the farthest past time instant according to jiffies
+- * macros.
+- */
+-static unsigned long bfq_smallest_from_now(void)
+-{
+-	return jiffies - MAX_JIFFY_OFFSET;
+-}
+-
+ /**
+  * bfq_bfqq_expire - expire a queue.
+  * @bfqd: device owning the queue.
+-- 
+2.15.1
+
@@ -0,0 +1,68 @@
+From f0ba5ea2fe45c0ad24a7dedae84a97f7aa046494 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Wed, 20 Dec 2017 17:27:36 +0100
+Subject: [PATCH] block, bfq: increase threshold to deem I/O as random
+
+If two processes do I/O close to each other, i.e., are cooperating
+processes in BFQ (and CFQ'S) nomenclature, then BFQ merges their
+associated bfq_queues, so as to get sequential I/O from the union of
+the I/O requests of the processes, and thus reach a higher
+throughput. A merged queue is then split if its I/O stops being
+sequential. In this respect, BFQ deems the I/O of a bfq_queue as
+(mostly) sequential only if less than 4 I/O requests are random, out
+of the last 32 requests inserted into the queue.
+
+Unfortunately, extensive testing (with the interleaved_io benchmark of
+the S suite [1], and with real applications spawning cooperating
+processes) has clearly shown that, with such a low threshold, only a
+rather low I/O throughput may be reached when several cooperating
+processes do I/O. In particular, the outcome of each test run was
+bimodal: if queue merging occurred and was stable during the test,
+then the throughput was close to the peak rate of the storage device,
+otherwise the throughput was arbitrarily low (usually around 1/10 of
+the peak rate with a rotational device). The probability to get the
+unlucky outcomes grew with the number of cooperating processes: it was
+already significant with 5 processes, and close to one with 7 or more
+processes.
+
+The cause of the low throughput in the unlucky runs was that the
+merged queues containing the I/O of these cooperating processes were
+soon split, because they contained more random I/O requests than those
+tolerated by the 4/32 threshold, but
+- that I/O would have however allowed the storage device to reach
+  peak throughput or almost peak throughput;
+- in contrast, the I/O of these processes, if served individually
+  (from separate queues) yielded a rather low throughput.
+
+So we repeated our tests with increasing values of the threshold,
+until we found the minimum value (19) for which we obtained maximum
+throughput, reliably, with at least up to 9 cooperating
+processes. Then we checked that the use of that higher threshold value
+did not cause any regression for any other benchmark in the suite [1].
+This commit raises the threshold to such a higher value.
+
+[1] https://github.com/Algodev-github/S
+
+Signed-off-by: Angelo Ruocco <angeloruocco90@gmail.com>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/bfq-iosched.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index bcb6d21baf12..0f48583b9380 100644
+--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
+@@ -178,7 +178,7 @@ static struct kmem_cache *bfq_pool;
+ #define BFQQ_SEEK_THR		(sector_t)(8 * 100)
+ #define BFQQ_SECT_THR_NONROT	(sector_t)(2 * 32)
+ #define BFQQ_CLOSE_THR		(sector_t)(8 * 1024)
+-#define BFQQ_SEEKY(bfqq)	(hweight32(bfqq->seek_history) > 32/8)
+#define BFQQ_SEEKY(bfqq)	(hweight32(bfqq->seek_history) > 19)
+ 
+ /* Min number of samples required to perform peak-rate update */
+ #define BFQ_RATE_MIN_SAMPLES	32
+-- 
+2.15.1
+
--- a/Show More
+++ b/Show More