diff --git a/net/libepc/Makefile b/net/libepc/Makefile new file mode 100644 index 00000000000..32452c33f13 --- /dev/null +++ b/net/libepc/Makefile @@ -0,0 +1,46 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ + +COMMENT= Easy Publish and Consume library + +GNOME_PROJECT= libepc +GNOME_VERSION= 0.4.0 +SHARED_LIBS += epc-1.0 0.0 # 3.0 +SHARED_LIBS += epc-ui-1.0 0.0 # 3.0 +CATEGORIES= net + +HOMEPAGE= http://live.gnome.org/libepc/ + +# LGPLv2.1 +PERMIT_DISTFILES_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_PACKAGE_CDROM= Yes + +EXTRACT_SUFX= .tar.bz2 + +MODULES= devel/gettext \ + x11/gnome + +WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avahi-client +WANTLIB += avahi-common avahi-glib cairo cairo-gobject dbus-1 +WANTLIB += drm e2fs-uuid expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 +WANTLIB += gthread-2.0 gtk-3 hogweed kvm m nettle p11-kit pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB += pthread-stubs soup-2.4 tasn1 xcb xcb-render xcb-shm +WANTLIB += xml2 z + +LIB_DEPENDS= devel/libsoup \ + net/avahi \ + sysutils/e2fsprogs \ + x11/gtk+3 + +AUTOCONF_VERSION= 2.68 + +CONFIGURE_STYLE= autoconf + +# Not much of use without a proper SIOCGIFINDEX +NO_REGRESS= Yes + +.include diff --git a/net/libepc/distinfo b/net/libepc/distinfo new file mode 100644 index 00000000000..2ddb490384d --- /dev/null +++ b/net/libepc/distinfo @@ -0,0 +1,5 @@ +MD5 (libepc-0.4.0.tar.bz2) = x/3hGFRtCddHr3sIy1K/rQ== +RMD160 (libepc-0.4.0.tar.bz2) = 1/30WA9zEUKmCPs2MM8pJ/3acF0= +SHA1 (libepc-0.4.0.tar.bz2) = u2F2PgE4rHuFs9PDAp9bLAq5TRA= +SHA256 (libepc-0.4.0.tar.bz2) = Kw42lq49ULxtB9SCUg70VeubQqlsQigIHedX74E+22w= +SIZE (libepc-0.4.0.tar.bz2) = 441692 diff --git a/net/libepc/patches/patch-configure_ac b/net/libepc/patches/patch-configure_ac new file mode 100644 index 00000000000..e883532ba5d --- /dev/null +++ b/net/libepc/patches/patch-configure_ac @@ -0,0 +1,18 @@ +$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ + +From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001 +From: Murray Cumming +Date: Wed, 31 Aug 2011 12:19:47 +0000 +Subject: Really use GTK+ 3. + +--- configure.ac.orig Thu Sep 29 16:54:42 2011 ++++ configure.ac Thu Sep 29 16:55:00 2011 +@@ -80,7 +80,7 @@ PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 + uuid >= 1.36 + $LIBSOUP + $GIO]) +-PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-2.0 >= 2.10]) ++PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-3.0 >= 3.0]) + + AC_SUBST(AVAHI_UI_CFLAGS) + AC_SUBST(AVAHI_UI_LIBS) diff --git a/net/libepc/patches/patch-examples_consumer-ui_c b/net/libepc/patches/patch-examples_consumer-ui_c new file mode 100644 index 00000000000..1ca7c99bb28 --- /dev/null +++ b/net/libepc/patches/patch-examples_consumer-ui_c @@ -0,0 +1,45 @@ +$OpenBSD: patch-examples_consumer-ui_c,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ + +From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001 +From: Murray Cumming +Date: Wed, 31 Aug 2011 12:19:47 +0000 +Subject: Really use GTK+ 3. + +--- examples/consumer-ui.c.orig Thu May 12 21:25:44 2011 ++++ examples/consumer-ui.c Thu Sep 29 16:55:00 2011 +@@ -35,7 +35,7 @@ list_keys (EpcConsumer *consumer, + keys = g_list_sort (keys, (GCompareFunc) strcmp); + + for (iter = keys; iter; iter = iter->next) +- gtk_combo_box_append_text (GTK_COMBO_BOX (keys_combo), iter->data); ++ gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (keys_combo), NULL, iter->data); + + gtk_combo_box_set_active (GTK_COMBO_BOX (keys_combo), 0); + gtk_widget_set_sensitive (keys_combo, TRUE); +@@ -71,7 +71,7 @@ keys_combo_changed_cb (GtkComboBox *combo_box, + + /* retreive a the currently selected resource */ + +- key = gtk_combo_box_get_active_text (combo_box); ++ key = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box)); + + if (key) + value = epc_consumer_lookup (consumer, key, &length, &error); +@@ -120,7 +120,7 @@ create_lookup_dialog (EpcConsumer *consumer, + + /* Setup the combo box listing keys. */ + +- keys_combo = gtk_combo_box_new_text (); ++ keys_combo = gtk_combo_box_text_new (); + gtk_widget_set_sensitive (keys_combo, FALSE); + + g_signal_connect (keys_combo, "changed", +@@ -165,7 +165,7 @@ create_lookup_dialog (EpcConsumer *consumer, + /* Create the dialog widget. */ + + dialog = gtk_dialog_new_with_buttons ("Published Value", NULL, +- GTK_DIALOG_NO_SEPARATOR, ++ (GtkDialogFlags)0, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); + diff --git a/net/libepc/patches/patch-examples_publisher-ui_c b/net/libepc/patches/patch-examples_publisher-ui_c new file mode 100644 index 00000000000..8f1b872f094 --- /dev/null +++ b/net/libepc/patches/patch-examples_publisher-ui_c @@ -0,0 +1,43 @@ +$OpenBSD: patch-examples_publisher-ui_c,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ + +From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001 +From: Murray Cumming +Date: Wed, 31 Aug 2011 12:19:47 +0000 +Subject: Really use GTK+ 3. + +--- examples/publisher-ui.c.orig Thu May 12 21:11:43 2011 ++++ examples/publisher-ui.c Thu Sep 29 16:55:00 2011 +@@ -366,25 +366,6 @@ schedule_auto_save (void) + auto_save_id = g_timeout_add (5 * 1000, auto_save_cb, NULL); + } + +-static void +-url_hook (GtkAboutDialog *dialog, +- const gchar *link, +- gpointer data G_GNUC_UNUSED) +-{ +- gchar *args[] = { "xdg-open", (gchar*) link, NULL }; +- GError *error = NULL; +- +- gdk_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (dialog)), +- NULL, args, NULL, G_SPAWN_SEARCH_PATH, +- NULL, NULL, NULL, &error); +- +- if (error) +- { +- show_error (GTK_WIDGET (dialog), "Cannot follow link.", error); +- g_error_free (error); +- } +-} +- + void + about_button_clicked_cb (GtkWidget *widget) + { +@@ -799,7 +780,6 @@ main (int argc, + g_set_application_name ("Easy Publisher Example"); + + gtk_init (&argc, &argv); +- gtk_about_dialog_set_url_hook (url_hook, NULL, NULL); + + builder = gtk_builder_new (); + load_ui (argv[0]); diff --git a/net/libepc/patches/patch-tests_framework_c b/net/libepc/patches/patch-tests_framework_c new file mode 100644 index 00000000000..1d9dde5b37b --- /dev/null +++ b/net/libepc/patches/patch-tests_framework_c @@ -0,0 +1,45 @@ +$OpenBSD: patch-tests_framework_c,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ + +- Add missing headers. +- Set interface index to -1 by default. + +--- tests/framework.c.orig Thu May 12 21:11:43 2011 ++++ tests/framework.c Thu Sep 29 11:28:48 2011 +@@ -24,8 +24,12 @@ + #include + #include + ++#include ++#include ++#include + #include +-#include ++#include ++#include + + #include + #include +@@ -188,12 +192,14 @@ epc_test_list_ifaces (void) + continue; + } + ++#ifdef SIOCGIFINDEX + if (ioctl (fd, SIOCGIFINDEX, req) < 0) + { + g_warning ("%s: ioctl(SIOCGIFINDEX): %s", + G_STRLOC, g_strerror (errno)); + goto out; + } ++#endif + + /* The following allows to fall back to ifr_index on kFreeBSD, where + ifr_ifindex does not exist. See bug #592474. */ +@@ -201,7 +207,7 @@ epc_test_list_ifaces (void) + #define ifr_ifindex ifr_index + #endif + +- ifaces[j].ifidx = req->ifr_ifindex; ++ ifaces[j].ifidx = -1; + ifaces[j].mask = epc_test_result; + + g_print ("%s: name=%s, ifidx=%u, \n", diff --git a/net/libepc/pkg/DESCR b/net/libepc/pkg/DESCR new file mode 100644 index 00000000000..6b0e0dda4c0 --- /dev/null +++ b/net/libepc/pkg/DESCR @@ -0,0 +1,9 @@ +The Easy Publish and Consume library provides an easy method to: + + * Publish data using HTTPS: EpcPublisher; + * Announce that information via DNS-SD: EpcDispatcher; + * find that information: EpcConsumer; + * And finally consume it. + +You can use this library as a key/value store published to the network, +using encryption, authentication and service discovery. diff --git a/net/libepc/pkg/PFRAG.shared b/net/libepc/pkg/PFRAG.shared new file mode 100644 index 00000000000..c67626c2aca --- /dev/null +++ b/net/libepc/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ +@lib lib/libepc-1.0.so.${LIBepc-1.0_VERSION} +@lib lib/libepc-ui-1.0.so.${LIBepc-ui-1.0_VERSION} diff --git a/net/libepc/pkg/PLIST b/net/libepc/pkg/PLIST new file mode 100644 index 00000000000..ddbd198fe17 --- /dev/null +++ b/net/libepc/pkg/PLIST @@ -0,0 +1,84 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $ +%%SHARED%% +include/libepc-1.0/ +include/libepc-1.0/libepc/ +include/libepc-1.0/libepc/consumer.h +include/libepc-1.0/libepc/contents.h +include/libepc-1.0/libepc/dispatcher.h +include/libepc-1.0/libepc/enums.h +include/libepc-1.0/libepc/marshal.h +include/libepc-1.0/libepc/protocol.h +include/libepc-1.0/libepc/publisher.h +include/libepc-1.0/libepc/service-info.h +include/libepc-1.0/libepc/service-monitor.h +include/libepc-1.0/libepc/service-type.h +include/libepc-1.0/libepc/shell.h +include/libepc-1.0/libepc/tls.h +include/libepc-ui-1.0/ +include/libepc-ui-1.0/libepc-ui/ +include/libepc-ui-1.0/libepc-ui/password-dialog.h +include/libepc-ui-1.0/libepc-ui/progress-window.h +lib/libepc-1.0.a +lib/libepc-1.0.la +lib/libepc-ui-1.0.a +lib/libepc-ui-1.0.la +lib/pkgconfig/ +lib/pkgconfig/libepc-1.0.pc +lib/pkgconfig/libepc-ui-1.0.pc +share/gtk-doc/ +share/gtk-doc/html/ +share/gtk-doc/html/libepc-1.0/ +share/gtk-doc/html/libepc-1.0/EpcProtocol.html +share/gtk-doc/html/libepc-1.0/EpcServiceInfo.html +share/gtk-doc/html/libepc-1.0/consuming.html +share/gtk-doc/html/libepc-1.0/dns-sd-support.html +share/gtk-doc/html/libepc-1.0/home.png +share/gtk-doc/html/libepc-1.0/index.html +share/gtk-doc/html/libepc-1.0/index.sgml +share/gtk-doc/html/libepc-1.0/internal-api.html +share/gtk-doc/html/libepc-1.0/left.png +share/gtk-doc/html/libepc-1.0/libepc-1.0-EpcServiceType.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-EpcShell.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-EpcTls.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-auth-context.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-consumer.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-contents.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-dispatcher.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-password-dialog.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-progress-window.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-publisher.html +share/gtk-doc/html/libepc-1.0/libepc-1.0-service-monitor.html +share/gtk-doc/html/libepc-1.0/libepc-1.0.devhelp2 +share/gtk-doc/html/libepc-1.0/publishing.html +share/gtk-doc/html/libepc-1.0/right.png +share/gtk-doc/html/libepc-1.0/style.css +share/gtk-doc/html/libepc-1.0/up.png +share/gtk-doc/html/libepc-1.0/widgets.html +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ +share/locale/ar/LC_MESSAGES/libepc.mo +share/locale/ca/LC_MESSAGES/libepc.mo +share/locale/cs/LC_MESSAGES/libepc.mo +share/locale/da/LC_MESSAGES/libepc.mo +share/locale/de/LC_MESSAGES/libepc.mo +share/locale/el/LC_MESSAGES/libepc.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ +share/locale/en_GB/LC_MESSAGES/libepc.mo +share/locale/es/LC_MESSAGES/libepc.mo +share/locale/fi/LC_MESSAGES/libepc.mo +share/locale/fr/LC_MESSAGES/libepc.mo +share/locale/gl/LC_MESSAGES/libepc.mo +share/locale/id/LC_MESSAGES/libepc.mo +share/locale/it/LC_MESSAGES/libepc.mo +share/locale/ja/LC_MESSAGES/libepc.mo +share/locale/lv/LC_MESSAGES/libepc.mo +share/locale/nb/LC_MESSAGES/libepc.mo +share/locale/pl/LC_MESSAGES/libepc.mo +share/locale/pt_BR/LC_MESSAGES/libepc.mo +share/locale/sl/LC_MESSAGES/libepc.mo +share/locale/sv/LC_MESSAGES/libepc.mo +share/locale/th/ +share/locale/th/LC_MESSAGES/ +share/locale/th/LC_MESSAGES/libepc.mo +share/locale/zh_CN/LC_MESSAGES/libepc.mo