August 2014 - crux-commits

ports/contrib (3.1): rrdtool: 1.4.7 -> 1.4.8
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit 3981d94f789b11972eecc42554aa827a7427c07b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Aug 29 19:35:11 2014 +1000 rrdtool: 1.4.7 -> 1.4.8 diff --git a/rrdtool/.footprint b/rrdtool/.footprint index 29e9e28..b470922 100644 --- a/rrdtool/.footprint +++ b/rrdtool/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rrdcached -rwxr-xr-x root/root usr/bin/rrdcgi +lrwxrwxrwx root/root usr/bin/rrdcreate -> rrdupdate +lrwxrwxrwx root/root usr/bin/rrdinfo -> rrdupdate -rwxr-xr-x root/root usr/bin/rrdtool -rwxr-xr-x root/root usr/bin/rrdupdate drwxr-xr-x root/root usr/include/ @@ -9,33 +11,32 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/rrd_client.h -rw-r--r-- root/root usr/include/rrd_format.h drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/librrd.a -rwxr-xr-x root/root usr/lib/librrd.la -lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.2.0 -lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.2.0 --rwxr-xr-x root/root usr/lib/librrd.so.4.2.0 +lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.2.1 +lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.2.1 +-rwxr-xr-x root/root usr/lib/librrd.so.4.2.1 +-rw-r--r-- root/root usr/lib/librrd_th.a -rwxr-xr-x root/root usr/lib/librrd_th.la -lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.2.0 -lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.2.0 --rwxr-xr-x root/root usr/lib/librrd_th.so.4.2.0 +lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.2.1 +lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.2.1 +-rwxr-xr-x root/root usr/lib/librrd_th.so.4.2.1 drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site_perl/ -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.16/RRDp.pm -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/RRDs.pm -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/ -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/RRDs/ --r-xr-xr-x root/root usr/lib/perl5/site_perl/5.16/linux-thread-multi/auto/RRDs/RRDs.so +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/RRDp.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/RRDs.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/ +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/ +-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/RRDs.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/librrd.pc drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/py_rrdtool-0.2.1-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/py_rrdtool-0.2.2-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/site-packages/rrdtoolmodule.so -drwxr-xr-x root/root usr/lib/rrdtool/ --rwxr-xr-x root/root usr/lib/rrdtool/ifOctets.tcl --rw-r--r-- root/root usr/lib/rrdtool/pkgIndex.tcl --rwxr-xr-x root/root usr/lib/tclrrd1.4.7.so +-rwxr-xr-x root/root usr/lib/tclrrd1.4.8.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/bin_dec_hex.1.gz @@ -70,3 +71,7 @@ drwxr-xr-x root/root usr/man/man3/ -r--r--r-- root/root usr/man/man3/RRDp.3pm.gz -r--r--r-- root/root usr/man/man3/RRDs.3pm.gz -rw-r--r-- root/root usr/man/man3/librrd.3.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/rrdtool/ +-rwxr-xr-x root/root usr/share/rrdtool/ifOctets.tcl +-rw-r--r-- root/root usr/share/rrdtool/pkgIndex.tcl diff --git a/rrdtool/.md5sum b/rrdtool/.md5sum index 5ec3acc..659449b 100644 --- a/rrdtool/.md5sum +++ b/rrdtool/.md5sum @@ -1 +1,2 @@ -ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz +dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.tar.gz +42e69fd496e2b9d9efbddc03fa081db7 rrdtool-pangofont.patch diff --git a/rrdtool/Pkgfile b/rrdtool/Pkgfile index cf8f6ca..1239466 100644 --- a/rrdtool/Pkgfile +++ b/rrdtool/Pkgfile @@ -5,22 +5,25 @@ # Depends on: intltool libart_lgpl libcgi libgd pango tcl name=rrdtool -version=1.4.7 +version=1.4.8 release=1 -source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz) +source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz + rrdtool-pangofont.patch) build() { cd $name-$version + patch -p1 -i $SRC/rrdtool-pangofont.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ --enable-shared \ - --disable-static \ --enable-perl-site-install \ - --enable-ruby-site-install + --enable-ruby-site-install \ + --disable-libwrap - make + make LIBS+="-lglib-2.0" make DESTDIR=$PKG install rm -r \ diff --git a/rrdtool/rrdtool-pangofont.patch b/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 0000000..60936d8 --- /dev/null +++ b/rrdtool/rrdtool-pangofont.patch @@ -0,0 +1,39 @@ +From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi(a)oetiker.ch> +Date: Wed, 24 Apr 2013 23:49:28 +0200 +Subject: [PATCH] move to non-deprecated pango_font_map_create_context + +--- + configure.ac | 2 +- + src/rrd_graph.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f9e395..d6b2722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, + EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") ++EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + + fi + EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index 5547aa6..25ae485 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4282,7 +4282,7 @@ void rrd_graph_init( + fontmap = pango_cairo_font_map_get_default(); + } + +- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap); ++ context = pango_font_map_create_context(fontmap); + + pango_cairo_context_set_resolution(context, 100); + +-- +1.8.1.6 +

1 0

ports/core (3.1): libdevmapper: update to 1.02.89
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit d761cd53a4e28094cc48a105c44bd12ae31176b6 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:36:24 2014 +0200 libdevmapper: update to 1.02.89 diff --git a/libdevmapper/.md5sum b/libdevmapper/.md5sum index c9373be..b6040ac 100644 --- a/libdevmapper/.md5sum +++ b/libdevmapper/.md5sum @@ -1 +1 @@ -8fec006327b266fa611b165d8ec0b008 LVM2.2.02.109.tgz +a69534060d67f8a5a3a4cc0690742d2d LVM2.2.02.110.tgz diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index f226e95..e703a84 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -4,12 +4,12 @@ # Depends on: eudev name=libdevmapper -version=1.02.88 +version=1.02.89 release=1 -source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.109.tgz) +source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.110.tgz) build() { - cd LVM2.2.02.109 + cd LVM2.2.02.110 # needed for static linking with eudev export UDEV_LIBS="$(pkg-config --libs --static libudev)"

1 0

ports/opt (3.1): lvm2: update to 2.02.110
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit c70ba59632377b30578a40a2fc9e1c7196670eac Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:33:45 2014 +0200 lvm2: update to 2.02.110 diff --git a/lvm2/.md5sum b/lvm2/.md5sum index c9373be..b6040ac 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1 +1 @@ -8fec006327b266fa611b165d8ec0b008 LVM2.2.02.109.tgz +a69534060d67f8a5a3a4cc0690742d2d LVM2.2.02.110.tgz diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 73617de..c782b62 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libdevmapper name=lvm2 -version=2.02.109 +version=2.02.110 release=1 source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.$version.tgz)

1 0

ports/opt (3.1): squid: update to 3.4.7
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit 68c85585df125a3c56d6b4987baf717f6f05d9c0 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:33:20 2014 +0200 squid: update to 3.4.7 diff --git a/squid/.md5sum b/squid/.md5sum index c9d2849..77a7bb8 100644 --- a/squid/.md5sum +++ b/squid/.md5sum @@ -1,2 +1,2 @@ dd94bf3ea23e552153b5ee03fc523a4e squid -78dba1ef230761577bce53633ca05c9d squid-3.4.6.tar.xz +74677634121649ccb87a5655fcd4298d squid-3.4.7.tar.xz diff --git a/squid/Pkgfile b/squid/Pkgfile index bdee898..a061fff 100644 --- a/squid/Pkgfile +++ b/squid/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=squid -version=3.4.6 -release=2 +version=3.4.7 +release=1 source=(http://www.squid-cache.org/Versions/v3/3.4/$name-$version.tar.xz squid)

1 0

ports/opt (3.1): mysql-ruby: rebuild for ruby 2.1
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit 57542982334bd8984a0824dab3b4b1109dd5656e Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:32:42 2014 +0200 mysql-ruby: rebuild for ruby 2.1 diff --git a/mysql-ruby/.footprint b/mysql-ruby/.footprint index 660e88a..0a99335 100644 --- a/mysql-ruby/.footprint +++ b/mysql-ruby/.footprint @@ -2,6 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/ruby/ drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/linux/ --rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/linux/mysql.so +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/ +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ +-rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/mysql.so diff --git a/mysql-ruby/Pkgfile b/mysql-ruby/Pkgfile index e75bd75..d96cc0e 100644 --- a/mysql-ruby/Pkgfile +++ b/mysql-ruby/Pkgfile @@ -5,7 +5,7 @@ name=mysql-ruby version=2.8.2 -release=1 +release=2 source=(http://tmtm.org/downloads/mysql/ruby/$name-$version.tar.gz) build () {

1 0

ports/opt (3.1): sqlite3-ruby: update to 1.3.9
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit e890cbc219524ec71c002f6ac1d8eeb06e713799 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:31:00 2014 +0200 sqlite3-ruby: update to 1.3.9 diff --git a/sqlite3-ruby/.footprint b/sqlite3-ruby/.footprint index badfdac..f110586 100644 --- a/sqlite3-ruby/.footprint +++ b/sqlite3-ruby/.footprint @@ -2,18 +2,18 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/ruby/ drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/linux/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/linux/sqlite3/ --r-xr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/linux/sqlite3/sqlite3_native.so --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3.rb -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/ --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/constants.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/database.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/errors.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/pragmas.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/resultset.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/statement.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/translator.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/value.rb --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/1.9/sqlite3/version.rb +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/ +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3.rb +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/ +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/constants.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/database.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/errors.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/pragmas.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/resultset.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/statement.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/translator.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/value.rb +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/sqlite3/version.rb +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/sqlite3/ +-r-xr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/sqlite3/sqlite3_native.so diff --git a/sqlite3-ruby/.md5sum b/sqlite3-ruby/.md5sum index 6fb5197..c7095a2 100644 --- a/sqlite3-ruby/.md5sum +++ b/sqlite3-ruby/.md5sum @@ -1 +1 @@ -b8b48dc154afe949f0a44dd49565391d sqlite3-1.3.7.gem +7b7d8efe8af40a627090d3b257231453 sqlite3-1.3.9.gem diff --git a/sqlite3-ruby/Pkgfile b/sqlite3-ruby/Pkgfile index e1d0d74..7e8197c 100644 --- a/sqlite3-ruby/Pkgfile +++ b/sqlite3-ruby/Pkgfile @@ -4,8 +4,8 @@ # Depends on: ruby, sqlite3 name=sqlite3-ruby -version=1.3.7 -release=2 +version=1.3.9 +release=1 source=(http://rubygems.org/downloads/sqlite3-$version.gem) build() {

1 0

ports/opt (3.1): ruby-doc: update to 2.1.2
by crux＠crux.nu 29 Aug '14

29 Aug '14

commit ecc505ac9b5201341426cff35a6d01415e32e011 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 29 09:30:17 2014 +0200 ruby-doc: update to 2.1.2 diff --git a/ruby-doc/.footprint b/ruby-doc/.footprint index d5343bd..0745689 100644 --- a/ruby-doc/.footprint +++ b/ruby-doc/.footprint @@ -8096,6 +8096,7 @@ drwxr-xr-x root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/ -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_Complex-i.ri -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_Date-i.ri -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_DateTime-i.ri +-rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_Encoding-i.ri -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_Exception-i.ri -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_FalseClass-i.ri -rw-r--r-- root/root usr/share/ri/2.1/system/Psych/Visitors/YAMLTree/visit_Float-i.ri diff --git a/ruby-doc/.md5sum b/ruby-doc/.md5sum index d4da5ce..429bbe7 100644 --- a/ruby-doc/.md5sum +++ b/ruby-doc/.md5sum @@ -1 +1 @@ -53edc33b2f590ecdd9f6a344b9d92d0d ruby-2.1.1.tar.bz2 +ed9b8565bdeccb401d628ec8d54a0774 ruby-2.1.2.tar.bz2 diff --git a/ruby-doc/Pkgfile b/ruby-doc/Pkgfile index 5e35ec9..940f254 100644 --- a/ruby-doc/Pkgfile +++ b/ruby-doc/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ruby name=ruby-doc -version=2.1.1 +version=2.1.2 release=1 source=(ftp://ftp.ruby-lang.org/pub/ruby/2.1/ruby-$version.tar.bz2)

1 0

ports/opt (3.1): grub2: added a tweak for ftsynth.h location
by crux＠crux.nu 28 Aug '14

28 Aug '14

commit a01b29be64347fe18f027bb80107e17c0b739c4b Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Aug 28 14:30:27 2014 -0500 grub2: added a tweak for ftsynth.h location diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 4e178c4..c2b0f58 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -1,7 +1,7 @@ # Description: A Multiboot boot loader # URL: http://www.gnu.org/software/grub/ # Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: libdevmapper, freetype +# Depends on: libdevmapper freetype name=grub2 version=2.00 @@ -13,9 +13,15 @@ source=(ftp://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ build() { export CFLAGS="${CFLAGS} -Wno-error" cd grub-$version + # fix for glibc 'gets' removal sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h + + # fix for ftsynth.h path + sed -i -e 's|freetype/ftsynth.h|freetype2/ftsynth.h|' util/grub-mkfont.c + patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in + ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-device-mapper \

1 0

ports/opt (3.1): qemu-all: include fix for TRIM passthrough for IDE devices
by crux＠crux.nu 28 Aug '14

28 Aug '14

commit ea49ed343ae9e1463da4e94cf0e1ee35bd183f4a Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Aug 28 20:19:58 2014 +0200 qemu-all: include fix for TRIM passthrough for IDE devices diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum index 1db3d6d..132400b 100644 --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1 +1,2 @@ +4d032f7e42c4f75dc71701f92077a85a fix-trim-ide.patch 6726977292b448cbc7f89998fac6983b qemu-2.1.0.tar.bz2 diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile index 9d64011..106aad0 100644 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -7,12 +7,15 @@ name=qemu-all version=2.1.0 -release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) +release=2 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 fix-trim-ide.patch) build() { cd qemu-$version + cd $name-$version + # fix TRIM passthrough for IDE devices + patch -p1 -i $SRC/fix-trim-ide.patch ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ diff --git a/qemu-all/fix-trim-ide.patch b/qemu-all/fix-trim-ide.patch new file mode 100644 index 0000000..65714e0 --- /dev/null +++ b/qemu-all/fix-trim-ide.patch @@ -0,0 +1,14 @@ +diff --git a/hw/ide/core.c b/hw/ide/core.c +index db191a6..7256592 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -688,7 +688,8 @@ void ide_dma_cb(void *opaque, int ret) + sector_num, n, s->dma_cmd); + #endif + +- if (!ide_sect_range_ok(s, sector_num, n)) { ++ if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) && ++ !ide_sect_range_ok(s, sector_num, n)) { + dma_buf_commit(s); + ide_dma_error(s); + return;

1 0

ports/opt (3.1): qemu: include fix for TRIM passthrough for IDE devices
by crux＠crux.nu 28 Aug '14

28 Aug '14

commit 32c2168e1fa84a3b6ea18524bb33a2f8cfa1572b Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Aug 28 20:18:59 2014 +0200 qemu: include fix for TRIM passthrough for IDE devices diff --git a/qemu/.md5sum b/qemu/.md5sum index 1db3d6d..132400b 100644 --- a/qemu/.md5sum +++ b/qemu/.md5sum @@ -1 +1,2 @@ +4d032f7e42c4f75dc71701f92077a85a fix-trim-ide.patch 6726977292b448cbc7f89998fac6983b qemu-2.1.0.tar.bz2 diff --git a/qemu/Pkgfile b/qemu/Pkgfile index bd5672f..cfdeac1 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -7,12 +7,14 @@ name=qemu version=2.1.0 -release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) +release=2 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 fix-trim-ide.patch) build() { cd $name-$version + # fix TRIM passthrough for IDE devices + patch -p1 -i $SRC/fix-trim-ide.patch ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ diff --git a/qemu/fix-trim-ide.patch b/qemu/fix-trim-ide.patch new file mode 100644 index 0000000..65714e0 --- /dev/null +++ b/qemu/fix-trim-ide.patch @@ -0,0 +1,14 @@ +diff --git a/hw/ide/core.c b/hw/ide/core.c +index db191a6..7256592 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -688,7 +688,8 @@ void ide_dma_cb(void *opaque, int ret) + sector_num, n, s->dma_cmd); + #endif + +- if (!ide_sect_range_ok(s, sector_num, n)) { ++ if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) && ++ !ide_sect_range_ok(s, sector_num, n)) { + dma_buf_commit(s); + ide_dma_error(s); + return;

1 0