diff options
author | root <root@rshg054.dnsready.net> | 2012-04-03 00:01:35 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-04-03 00:01:35 +0000 |
commit | c7cb603f86b4d4fb6567e3faa15b916a306f7004 (patch) | |
tree | bfdbca0002d6aeecc13f29a1c14d3991e6e93d4c /community-testing | |
parent | 321f44e3a5da426309c4b6664af035c97f907565 (diff) |
Tue Apr 3 00:01:35 UTC 2012
Diffstat (limited to 'community-testing')
18 files changed, 1042 insertions, 0 deletions
diff --git a/community-testing/contacts/0001-Fix-Makefile-whitespace.patch b/community-testing/contacts/0001-Fix-Makefile-whitespace.patch new file mode 100644 index 000000000..3c6e3b5f9 --- /dev/null +++ b/community-testing/contacts/0001-Fix-Makefile-whitespace.patch @@ -0,0 +1,19 @@ +From d69e65a87e58059fb7876987b4369d932ac35e17 Mon Sep 17 00:00:00 2001 +From: Joshua Lock <josh@linux.intel.com> +Date: Wed, 15 Dec 2010 14:06:44 +0000 +Subject: Fix Makefile whitespace for the new improved strict make 3.82 + +Signed-off-by: Joshua Lock <josh@linux.intel.com> +--- +diff --git a/Makefile.am b/Makefile.am +index 7c36d37..0a24f3d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +-- +cgit v0.9.0.2 diff --git a/community-testing/contacts/PKGBUILD b/community-testing/contacts/PKGBUILD new file mode 100644 index 000000000..a2fb71ad6 --- /dev/null +++ b/community-testing/contacts/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 68782 2012-04-01 22:05:25Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=contacts +pkgver=0.12 +pkgrel=6 +pkgdesc="Small, lightweight GTK+ address book app" +arch=('i686' 'x86_64') +url="http://pimlico-project.org/contacts.html" +license=('GPL') +depends=('gtk2' 'evolution-data-server' 'desktop-file-utils' 'xdg-utils') +makedepends=('intltool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + 0001-Fix-Makefile-whitespace.patch) +sha256sums=('0993f34819b92e09ab64e8a90231afc3178a19a4a99cf02c3050f51a44850782' + 'f6e3879c1aacbb62e481d9c1c33679ae12f986a26a96b112ec4d7f5f3358efbf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-install --disable-gnome-vfs \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community-testing/contacts/contacts.install b/community-testing/contacts/contacts.install new file mode 100644 index 000000000..f52f6a097 --- /dev/null +++ b/community-testing/contacts/contacts.install @@ -0,0 +1,24 @@ +pkgname=contacts + +post_install() { + gconfpkg --install $pkgname + update-desktop-database -q + xdg-icon-resource forceupdate +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate +} diff --git a/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch b/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch new file mode 100644 index 000000000..674ec2395 --- /dev/null +++ b/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch @@ -0,0 +1,39 @@ +From f3e8719489fc5db5ae87dd03d39aad176d65762f Mon Sep 17 00:00:00 2001 +From: Paul Wise <pabs3@bonedaddy.net> +Date: Fri, 29 Apr 2011 13:10:15 +0800 +Subject: [PATCH] Fix FTBFS with newer GCC + +--- + configure.ac | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7f009d9..0181292 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) + AC_SUBST(GETTEXT_PACKAGE) + AM_GLIB_GNU_GETTEXT + +-PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0) ++PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0 pango) + + PKG_CHECK_MODULES(GTK, gtk+-2.0) + AC_SUBST(GTK_CFLAGS) +diff --git a/src/Makefile.am b/src/Makefile.am +index 90c7049..3bb4f32 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -35,7 +35,7 @@ dates_SOURCES = $(platform) \ + gconf-bridge.h \ + gconf-bridge.c + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la ++dates_LDADD = libgtkdatesview.la -lm $(DATES_LIBS) + + if USE_OWL + dates_LDADD += $(top_builddir)/libowl/libowl.la +-- +1.7.4.4 + diff --git a/community-testing/dates/0001-Fix-Makefile-whitespace.patch b/community-testing/dates/0001-Fix-Makefile-whitespace.patch new file mode 100644 index 000000000..9feda3915 --- /dev/null +++ b/community-testing/dates/0001-Fix-Makefile-whitespace.patch @@ -0,0 +1,20 @@ +From bc98e2896682ac831cd27142c7e76fe0f8280bee Mon Sep 17 00:00:00 2001 +From: Joshua Lock <josh@linux.intel.com> +Date: Wed, 15 Dec 2010 14:07:50 +0000 +Subject: Fix Makefile whitespace for the new improved strict make 3.82 + +Signed-off-by: Joshua Lock <josh@linux.intel.com> +--- +diff --git a/Makefile.am b/Makefile.am +index e8a3c7f..51b4f1d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update + MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` + +-- +cgit v0.9.0.2 diff --git a/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch b/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch new file mode 100644 index 000000000..e7fce46f3 --- /dev/null +++ b/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch @@ -0,0 +1,155 @@ +From 7771e0b3d75b4ba04756d6c6ffc03d644df2db5f Mon Sep 17 00:00:00 2001 +From: Lucas Hermann Negri <lucashnegri@gmail.com> +Date: Wed, 13 Oct 2010 18:49:20 -0300 +Subject: [PATCH] Replaced the calls to the deprecated functions e_source_{set,get}_color + with the new API (e_source_{set,peek}_color_spec). + +--- + src/dates_gtk.c | 40 ++++++++++++---------------------------- + src/dates_main.c | 2 +- + src/dates_view.c | 10 ++++------ + 3 files changed, 17 insertions(+), 35 deletions(-) + +diff --git a/src/dates_gtk.c b/src/dates_gtk.c +index 78e71bb..403bc25 100644 +--- a/src/dates_gtk.c ++++ b/src/dates_gtk.c +@@ -1016,7 +1016,6 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + GtkTreeIter iter; + GError *error = NULL; + const gchar *relative_uri; +- guint32 new_colour; + + #ifdef WITH_HILDON + GdkColor *hildon_color; +@@ -1055,7 +1054,8 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + source = e_source_new (name, relative_uri); + + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + + #ifdef WITH_HILDON +@@ -1063,17 +1063,11 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif + +- /* Set the colour */ +- e_source_set_color (source, new_colour); +- + /* Set the group for the source */ + e_source_set_group (source, group); + e_source_group_add_source (group, source, 0); +@@ -1169,7 +1163,6 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + ESourceGroup *group; + + GdkColor colour; +- guint32 raw_colour; + + const gchar *name = NULL; + const gchar *uri = NULL; +@@ -1335,12 +1328,8 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + + /* Get the colour from the the source */ +- e_source_get_color (source, &raw_colour); +- +- /* Munge this into something usable */ +- colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8); +- colour.green = (guint16)(((raw_colour & 0xff00) >> 8) << 8); +- colour.blue = (guint16)(((raw_colour & 0xff) << 8)); ++ const gchar* spec = e_source_peek_color_spec(source); ++ gdk_color_parse(spec, &colour); + + /* Now we need to allocate the colour */ + gdk_colormap_alloc_color (gdk_colormap_get_system (), &colour, TRUE, TRUE); +@@ -1440,26 +1429,21 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + * Next we need to pack the GDK colour into guint32 + * for eds + */ +- guint32 new_colour = 0; + + GError *error = NULL; + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + #ifdef WITH_HILDON + hildon_color_button_get_color (HILDON_COLOR_BUTTON(color_button), &colour); + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif +- /* Update the colour */ +- e_source_set_color (source, new_colour); + + /* And the name */ + e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry)))); +diff --git a/src/dates_main.c b/src/dates_main.c +index ce05fe8..1f7770d 100644 +--- a/src/dates_main.c ++++ b/src/dates_main.c +@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d) + system_source = e_source_new (_("Personal"), "system"); + + /* Default Evolution colour */ +- e_source_set_color (system_source, 0xBECEDD); ++ e_source_set_color_spec (system_source, "#BECEDD"); + + /* Set the group for the source and put it in the group */ + e_source_set_group (system_source, local_group); +diff --git a/src/dates_view.c b/src/dates_view.c +index d65db2f..9d28a15 100644 +--- a/src/dates_view.c ++++ b/src/dates_view.c +@@ -4846,7 +4846,6 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + DatesViewPrivate *priv = DATES_VIEW_GET_PRIVATE (view); + DatesViewCalendar *cal; + ESource *source; +- guint32 colour; + /* GError *error = NULL;*/ + + g_return_if_fail (E_IS_CAL (ecal)); +@@ -4876,12 +4875,11 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + cal->text_gc = gdk_gc_new ( + GDK_DRAWABLE (priv->main->window)); + +- if (e_source_get_color (source, &colour)) { ++ const gchar* spec = e_source_peek_color_spec (source); ++ if (spec) { + GdkColor gcolour, dgcolour, tgcolour; +- gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101; +- gcolour.green = ((colour & 0xFF00) >> 8) * 0x101; +- gcolour.blue = (colour & 0xFF) * 0x101; +- ++ gdk_color_parse(spec, &gcolour); ++ + /* This is simplified sRGB -> LAB conversion; we do not need it + * entirely precise, as we are only going to chose between + * black or white text based on the L value. +-- +1.7.3.1 + diff --git a/community-testing/dates/PKGBUILD b/community-testing/dates/PKGBUILD new file mode 100644 index 000000000..0c6dcf2d1 --- /dev/null +++ b/community-testing/dates/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 68786 2012-04-01 22:13:21Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=dates +pkgver=0.4.11 +pkgrel=5 +pkgdesc="Small, lightweight GTK+ calendar app" +arch=('i686' 'x86_64') +url="http://pimlico-project.org/dates.html" +license=('GPL') +depends=('gtk2' 'evolution-data-server' 'xdg-utils') +makedepends=('intltool') +options=('!emptydirs') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch + 0001-Fix-Makefile-whitespace.patch + 0001-Fix-FTBFS-with-newer-GCC.patch) +sha256sums=('60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03' + '88ab8de4861253be1a8db1be4432f71307fcffa376be95e9495cff021b7ead62' + 'fc20f51200a78c74881b98f2b2ea9c3ba01f09393fcc2cf38ecab78ee54f4bb4' + '0e32c4d9ac4c604330bf8672e47e44c710ae56d9f6dc496e736166c536a4787e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch" + patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" + patch -Np1 -i "$srcdir/0001-Fix-FTBFS-with-newer-GCC.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-owl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community-testing/dates/dates.install b/community-testing/dates/dates.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community-testing/dates/dates.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/lomoco/PKGBUILD b/community-testing/lomoco/PKGBUILD new file mode 100644 index 000000000..03d680160 --- /dev/null +++ b/community-testing/lomoco/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 68775 2012-04-01 19:51:42Z dreisner $ +# Maintainer: Jeff Mickey <j@codemac.net> +# Contributor: Shadowhand <woody.gilk@gmail.com> + +pkgname=lomoco +pkgver=1.0 +pkgrel=8 +url="http://www.lomoco.org/" +pkgdesc="Logitech USB mouse configuration program" +license=('GPL') +depends=('libusb-compat') +replaces=('lmctl') +arch=('i686' 'x86_64') +options=(!libtool) +backup=(etc/udev/lomoco_mouse.conf) +source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz + "lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163" + lomoco_mouse.conf + lomoco.sh) +md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d' + '87aeccb99413faf9e49453215c3d0b8a' + '182b10a7e4a1828a93c1d55ef7f81b97' + 'bc92f661641265b33b27895ef24028fd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/lomoco_mx518.patch + ./autogen.sh --prefix=/usr --mandir=/usr/share/man + make + make udev-rules + make DESTDIR=${pkgdir} install + + # Fix and install udev rules and helpers + sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco + sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules + sed -i 's|SYSFS|ATTR|' udev/lomoco.rules + install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules + install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh + install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf +} diff --git a/community-testing/lomoco/lomoco.sh b/community-testing/lomoco/lomoco.sh new file mode 100644 index 000000000..76e2392da --- /dev/null +++ b/community-testing/lomoco/lomoco.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then + . /etc/udev/lomoco_mouse.conf + + options= + + if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then + options="--$LOGITECH_MOUSE_RESOLUTION" + fi + + case "$LOGITECH_MOUSE_SMS" in + yes) options="$options --sms" ;; + no) options="$options --no-sms" ;; + esac + + if [ -n "$options" ]; then + /usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options + fi + +fi 2>&1 | /usr/bin/logger -t lomoco diff --git a/community-testing/lomoco/lomoco_mouse.conf b/community-testing/lomoco/lomoco_mouse.conf new file mode 100644 index 000000000..b8c534ec2 --- /dev/null +++ b/community-testing/lomoco/lomoco_mouse.conf @@ -0,0 +1,5 @@ +# Possible Resolutions Are: 400 800 1200 1600 2000 +#LOGITECH_MOUSE_RESOLUTION="800" + +# SmartScroll/Cruise Control (SMS command set): yes or no +#LOGITECH_MOUSE_SMS="no" diff --git a/community-testing/multipath-tools/PKGBUILD b/community-testing/multipath-tools/PKGBUILD new file mode 100644 index 000000000..267d1c27b --- /dev/null +++ b/community-testing/multipath-tools/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68770 2012-04-01 19:51:20Z dreisner $ +# Maintainer: +# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> +# Contributor: Michael P <ptchinster@archlinux.us> +# Contributor: Matt Heagney <matt@heagney.com> + +pkgname=multipath-tools +pkgver=0.4.9 +pkgrel=6 +pkgdesc="Multipath Tools For Linux" +arch=('i686' 'x86_64') +url="http://christophe.varoqui.free.fr/" +license=('GPL') +depends=('libaio' 'device-mapper') +backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') +install=multipath-tools.install +options=('!emptydirs') +source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" + "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch') +md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' + '9324ff0ba8330dcb21b2fcf64988026f' + 'be11462922eeeb9fcd2ba5f3f137b7d9' + '7c04ef96441363b0d43a2ebb13a87659' + '2576fc535d7fa767837b1c7827013e52') + +build() { + patch -p1 -i fix-build.patch + + sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile + sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules + + # Needs to be fixed upstream. Refer to + # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 + export LDFLAGS=${LDFLAGS/-Wl,--as-needed} + + make +} + +package() { + make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf + install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd +} diff --git a/community-testing/multipath-tools/fix-build.patch b/community-testing/multipath-tools/fix-build.patch new file mode 100644 index 000000000..c6196f73b --- /dev/null +++ b/community-testing/multipath-tools/fix-build.patch @@ -0,0 +1,140 @@ +--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 +@@ -6,7 +6,7 @@ + + CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-LDFLAGS = -ldevmapper ++LIBS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o + EXEC = kpartx +@@ -14,8 +14,7 @@ + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) +@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 +@@ -32,11 +32,10 @@ + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 +@@ -7,32 +7,30 @@ + OBJS = main.o + + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath + + EXEC = multipath + + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz +- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules +- rm $(DESTDIR)$(bindir)/$(EXEC) +- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)$(bindir)/$(EXEC) ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 +@@ -6,8 +6,8 @@ + # basic flags setting + # + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ +- -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ ++ -L$(multipathdir) -lmultipath + + # + # debuging stuff +@@ -28,21 +28,20 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(rcdir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) + diff --git a/community-testing/multipath-tools/multipath-tools.install b/community-testing/multipath-tools/multipath-tools.install new file mode 100644 index 000000000..fa58bbc35 --- /dev/null +++ b/community-testing/multipath-tools/multipath-tools.install @@ -0,0 +1,4 @@ +post_install() { + + echo " * For full functonality ensure that the dm_multipath kernel module is loaded" +} diff --git a/community-testing/multipath-tools/multipath.conf b/community-testing/multipath-tools/multipath.conf new file mode 100644 index 000000000..6dacf093d --- /dev/null +++ b/community-testing/multipath-tools/multipath.conf @@ -0,0 +1,8 @@ +# +# Very Basic Multipath Configuration File +# + +defaults { + getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" +} + diff --git a/community-testing/multipath-tools/multipath.conf.annotated b/community-testing/multipath-tools/multipath.conf.annotated new file mode 100644 index 000000000..b79488413 --- /dev/null +++ b/community-testing/multipath-tools/multipath.conf.annotated @@ -0,0 +1,362 @@ +## +## This is a template multipath-tools configuration file +## Uncomment the lines relevent to your environment +## +# +## +## name : defaults +## desc : multipath-tools default settings +## +#defaults { +# # +# # name : udev_dir +# # desc : directory where udev creates its device nodes +# # default : /dev +# # +# udev_dir /dev +# +# # +# # name : polling_interval +# # scope : multipathd +# # desc : interval between two path checks in seconds +# # default : 5 +# # +# polling_interval 10 +# +# # +# # name : selector +# # scope : multipath +# # desc : the default path selector algorithm to use +# # these algorithms are offered by the kernel multipath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# selector "round-robin 0" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : the default path grouping policy to apply to unspecified +# # multipaths +# # default : multibus +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a path +# # priority value. The ALUA bits in SPC-3 provide an +# # exploitable prio value for example. "none" is a valid value +# # default : (null) +# # +# #prio_callout "/bin/true" +# +# # +# # name : path_checker +# # scope : multipath & multipathd +# # desc : the default method used to determine the paths' state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# #path_checker directio +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : rr_weight +# # scope : multipath +# # desc : if set to priorities the multipath configurator will assign +# # path weights as "path prio * rr_min_io" +# # values : priorities|uniform +# # default : uniform +# # +# rr_weight priorities +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : user_friendly_names +# # scope : multipath +# # desc : If set to "yes", using the bindings file +# # /var/lib/multipath/bindings to assign a persistent and +# # unique alias to the multipath, in the form of mpath<n>. +# # If set to "no" use the WWID as the alias. In either case +# # this be will be overriden by any specific aliases in this +# # file. +# # values : yes|no +# # default : no +# user_friendly_names no +# +#} +# +## +## name : blacklist +## scope : multipath & multipathd +## desc : list of device names to discard as not multipath candidates +## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop +## +#blacklist { +# wwid 26353900f02796769 +# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" +# devnode "^hd[a-z][[0-9]*]" +# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" +# device { +# vendor DEC.* +# product MSA[15]00 +# } +#} +## +## name : blacklist_exceptions +## scope : multipath & multipathd +## desc : list of device names to be treated as multipath candidates +## even if they are on the blacklist. +## Note: blacklist exceptions are only valid in the same class. +## It is not possible to blacklist devices using the devnode keyword +## and to exclude some devices of them using the wwid keyword. +## default : - +## +#blacklist_exceptions { +# devnode "^dasd[c-d]+[0-9]*" +# wwid "IBM.75000000092461.4d00.34" +# wwid "IBM.75000000092461.4d00.35" +# wwid "IBM.75000000092461.4d00.36" +#} +# +## +## name : multipaths +## scope : multipath & multipathd +## desc : list of multipaths finest-grained settings +## +#multipaths { +# # +# # name : multipath +# # scope : multipath & multipathd +# # desc : container for settings that apply to one specific multipath +# # +# multipath { +# # +# # name : wwid +# # scope : multipath & multipathd +# # desc : index of the container +# # +# wwid 3600508b4000156d700012000000b0000 +# +# # +# # name : alias +# # scope : multipath +# # desc : symbolic name for the multipath +# # +# alias yellow +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to this multipath +# # values : failover, multibus, group_by_serial +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# # path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# } +# multipath { +# wwid 1DEC_____321816758474 +# alias red +# rr_weight priorities +# } +#} +# +## +## name : devices +## scope : multipath & multipathd +## desc : list of per storage controller settings +## overrides default settings (device_maps block) +## overriden by per multipath settings (multipaths block) +## +#devices { +# # +# # name : device +# # scope : multipath & multipathd +# # desc : settings for this specific storage controller +# # +# device { +# # +# # name : vendor, product +# # scope : multipath & multipathd +# # desc : index for the block +# # +# vendor "COMPAQ " +# product "HSV110 (C)COMPAQ" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to multipath hosted +# # by this storage controller +# # values : failover = 1 path per priority group +# # multibus = all valid paths in 1 priority +# # group +# # group_by_serial = 1 priority group per detected +# # serial number +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a path +# # weight. Weights are summed for each path group to +# # determine the next PG to use case of failure. +# # "none" is a valid value. +# # default : no callout, all paths equals +# # +# prio_callout "/sbin/mpath_prio_balance_units %d" +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback 30 +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : product_blacklist +# # scope : multipath & multipathd +# # desc : product strings to blacklist for this vendor +# # default : none +# # +# product_blacklist LUN_Z +# } +# device { +# vendor "COMPAQ " +# product "MSA1000 " +# path_grouping_policy multibus +# path_checker tur +# rr_weight priorities +# } +#} diff --git a/community-testing/multipath-tools/multipathd.rc b/community-testing/multipath-tools/multipathd.rc new file mode 100644 index 000000000..7f5ef5d6a --- /dev/null +++ b/community-testing/multipath-tools/multipathd.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting multipathd" + /usr/bin/multipathd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon multipathd + stat_done + fi + ;; + stop) + stat_busy "Stopping multipathd" + [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon multipathd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/usb_modeswitch/PKGBUILD b/community-testing/usb_modeswitch/PKGBUILD new file mode 100644 index 000000000..f62176a28 --- /dev/null +++ b/community-testing/usb_modeswitch/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 68773 2012-04-01 19:51:31Z dreisner $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=usb_modeswitch +pkgver=1.2.2 +pkgrel=2 +_pkgdata=20120120 +pkgdesc="Activating switchable USB devices on Linux." +arch=('i686' 'x86_64') +url="http://www.draisberghof.de/usb_modeswitch/" +license=('GPL') +depends=('libusb-compat' 'tcl') +makedepends=('gcc' 'make') +backup=("etc/$pkgname.conf") +source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" + "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" + "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") +md5sums=('4f3d3b9342b59b488089a8a81abda3ae' + 'c899cc9c71bb35f3ec600b7cd1455c65' + 'c12e19e3992b5beac9b6c48555cff660') + +build() { + cd $srcdir/usb-modeswitch-$pkgver/ + make clean + make +} + +package() { + cd $srcdir/usb-modeswitch-$pkgver/ + + mkdir -p $pkgdir/usr/lib/udev + mkdir -p $pkgdir/etc + mkdir -p $pkgdir/usr/share/man/man1 + + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + + cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup + + cd $srcdir/usb-modeswitch-data-${_pkgdata} + make DESTDIR=$pkgdir install +} |