Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

6
comms/libopensync/DESCR Normal file
View File

@@ -0,0 +1,6 @@
OpenSync is a synchronization framework that is platform and distribution
independent. It consists of a powerful sync-engine and several plugins
that can be used to connect to devices.
OpenSync is very flexible and capable of synchronizing any type of data,
including contacts, calendar, tasks, notes and files.

View File

@@ -0,0 +1,25 @@
# $NetBSD: Makefile,v 1.17 2013/05/09 07:39:05 adam Exp $
#
DISTNAME= libopensync-0.22
PKGREVISION= 10
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.opensync.org/
COMMENT= Platform independent synchronization framework
USE_TOOLS+= pkg-config
USE_LANGUAGES= c
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-python
BUILDLINK_TRANSFORM+= rm:-Werror
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

50
comms/libopensync/PLIST Normal file
View File

@@ -0,0 +1,50 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:40 joerg Exp $
bin/osyncbinary
bin/osyncdump
bin/osyncplugin
bin/osyncstress
bin/osynctest
include/opensync-1.0/opensync/file.h
include/opensync-1.0/opensync/opensync-xml-contact.h
include/opensync-1.0/opensync/opensync.h
include/opensync-1.0/opensync/opensync_anchor.h
include/opensync-1.0/opensync/opensync_change.h
include/opensync-1.0/opensync/opensync_changecmds.h
include/opensync-1.0/opensync/opensync_context.h
include/opensync-1.0/opensync/opensync_convert.h
include/opensync-1.0/opensync/opensync_convreg.h
include/opensync-1.0/opensync/opensync_debug.h
include/opensync-1.0/opensync/opensync_env.h
include/opensync-1.0/opensync/opensync_error.h
include/opensync-1.0/opensync/opensync_filter.h
include/opensync-1.0/opensync/opensync_group.h
include/opensync-1.0/opensync/opensync_hashtable.h
include/opensync-1.0/opensync/opensync_member.h
include/opensync-1.0/opensync/opensync_plugin.h
include/opensync-1.0/opensync/opensync_serializer.h
include/opensync-1.0/opensync/opensync_time.h
include/opensync-1.0/opensync/opensync_xml.h
include/opensync-1.0/opensync/xml-support.h
include/opensync-1.0/osengine/engine.h
include/opensync-1.0/osengine/osengine_debug.h
include/opensync-1.0/osengine/osengine_engine.h
include/opensync-1.0/osengine/osengine_mapping.h
include/opensync-1.0/osengine/osengine_status.h
lib/libopensync-xml.la
lib/libopensync.la
lib/libosengine.la
lib/opensync/formats/contact.la
lib/opensync/formats/data.la
lib/opensync/formats/event.la
lib/opensync/formats/file.la
lib/opensync/formats/note.la
lib/opensync/formats/todo.la
lib/opensync/formats/xml-evolution.la
lib/opensync/formats/xml-kde.la
lib/opensync/formats/xml-vcal.la
lib/opensync/formats/xml-vcard.la
lib/opensync/formats/xml-vnote.la
lib/opensync/formats/xmldoc.la
lib/pkgconfig/opensync-1.0.pc
lib/pkgconfig/osengine-1.0.pc
libexec/osplugin

View File

@@ -0,0 +1,17 @@
# $NetBSD: buildlink3.mk,v 1.13 2013/05/09 07:39:05 adam Exp $
BUILDLINK_TREE+= libopensync
.if !defined(LIBOPENSYNC_BUILDLINK3_MK)
LIBOPENSYNC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libopensync+= libopensync>=0.22
BUILDLINK_ABI_DEPENDS.libopensync+= libopensync>=0.22nb10
BUILDLINK_PKGSRCDIR.libopensync?= ../../comms/libopensync
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.endif # LIBOPENSYNC_BUILDLINK3_MK
BUILDLINK_TREE+= -libopensync

View File

@@ -0,0 +1,12 @@
$NetBSD: distinfo,v 1.7 2011/11/30 23:48:18 hans Exp $
SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30
RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f
Size (libopensync-0.22.tar.bz2) = 489978 bytes
SHA1 (patch-aa) = 4bcf03611850719042bafd794fc413cef159a702
SHA1 (patch-ab) = 057f995d58c98eba96e22671d9c8ee0ec8270b3e
SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3
SHA1 (patch-ad) = d2a199b04788512378dbd5024b34d367da6add5d
SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1
SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7
SHA1 (patch-opensync_opensync_time.c) = cb6cf27e1ba3fcd6a0cb139759d4da7306817e10

View File

@@ -0,0 +1,85 @@
$NetBSD: patch-aa,v 1.3 2011/07/21 15:35:55 joerg Exp $
--- formats/vformats-xml/vformat.c.orig 2007-03-27 20:49:27.000000000 +0900
+++ formats/vformats-xml/vformat.c
@@ -236,7 +236,7 @@ static void _read_attribute_value_add (V
if (charset) {
cd = iconv_open("UTF-8", charset->str);
-#ifdef SOLARIS
+#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__)
if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
#else
if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
@@ -264,7 +264,7 @@ static void _read_attribute_value_add (V
/* because inbuf is not UTF-8, we think it is ISO-8859-1 */
cd = iconv_open("UTF-8", "ISO-8859-1");
-#ifdef SOLARIS
+#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__)
if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
#else
if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
@@ -302,8 +302,8 @@ static void _read_attribute_value (VForm
if ((a = *(++lp)) == '\0') break;
if ((b = *(++lp)) == '\0') break;
- if (isalnum(a)) {
- if (isalnum(b)) {
+ if (isalnum((unsigned char)a)) {
+ if (isalnum((unsigned char)b)) {
/* e.g. ...N=C3=BCrnberg\r\n
* ^^^
*/
@@ -317,7 +317,7 @@ static void _read_attribute_value (VForm
* ^
*/
char *tmplp = lp;
- if (*(++tmplp) == '\r' && *(++tmplp) == '\n' && isalnum(*(++tmplp))) {
+ if (*(++tmplp) == '\r' && *(++tmplp) == '\n' && isalnum((unsigned char)*(++tmplp))) {
x1 = a;
x2 = *tmplp;
lp = tmplp;
@@ -336,7 +336,7 @@ static void _read_attribute_value (VForm
c = *(++tmplp);
d = *(++tmplp);
e = *(++tmplp);
- if (b == '\r' && c == '\n' && isalnum(d) && isalnum(e)) {
+ if (b == '\r' && c == '\n' && isalnum((unsigned char)d) && isalnum((unsigned char)e)) {
x1 = d;
x2 = e;
lp = tmplp;
@@ -357,8 +357,8 @@ static void _read_attribute_value (VForm
if (x1 && x2) {
char c;
- a = tolower (x1);
- b = tolower (x2);
+ a = tolower ((unsigned char)x1);
+ b = tolower ((unsigned char)x2);
c = (((a>='a'?a-'a'+10:a-'0')&0x0f) << 4)
| ((b>='a'?b-'a'+10:b-'0')&0x0f);
@@ -1751,11 +1751,11 @@ static const char *base64_alphabet = "AB
//static unsigned char _evc_base64_rank[256];
-static void base64_init(char *rank)
+static void base64_init(char *rank, size_t len)
{
int i;
- memset(rank, 0xff, sizeof(rank));
+ memset(rank, 0xff, len);
for (i=0;i<64;i++) {
rank[(unsigned int)base64_alphabet[i]] = i;
}
@@ -1880,7 +1880,7 @@ static size_t base64_encode_step(unsigne
static size_t base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)
{
unsigned char base64_rank[256];
- base64_init((char*)base64_rank);
+ base64_init((char*)base64_rank, sizeof(base64_rank));
register unsigned char *inptr, *outptr;
unsigned char *inend, c;

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-ab,v 1.1 2007/12/12 13:24:39 yyamano Exp $
--- osengine/osengine_client.c.orig 2007-03-27 20:49:26.000000000 +0900
+++ osengine/osengine_client.c
@@ -765,10 +765,10 @@ osync_bool osync_client_spawn(OSyncClien
osync_env_export_loaded_modules(osync_group_get_env(engine->group));
char *memberstring = g_strdup_printf("%lli", osync_member_get_id(client->member));
- execlp(OSPLUGIN, OSPLUGIN, osync_group_get_configdir(engine->group), memberstring, NULL);
+ execlp(OSPLUGIN, OSPLUGIN, osync_group_get_configdir(engine->group), memberstring, (char *)NULL);
if (errno == ENOENT) {
- execlp("./osplugin", "osplugin", osync_group_get_configdir(engine->group), memberstring, NULL);
+ execlp("./osplugin", "osplugin", osync_group_get_configdir(engine->group), memberstring, (char *)NULL);
}
osync_trace(TRACE_INTERNAL, "unable to exec");

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.1 2007/12/11 13:35:37 yyamano Exp $
--- tests/mock-plugin/mock_sync.c.orig 2007-03-27 20:49:19.000000000 +0900
+++ tests/mock-plugin/mock_sync.c
@@ -224,7 +224,7 @@ static void mock_get_changeinfo(OSyncCon
return;
}
while ((de = g_dir_read_name(dir))) {
- char *filename = g_build_filename(env->path, de, NULL);
+ char *filename = g_build_filename(env->path, de, (char *)NULL);
if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
/* Report normal files */
OSyncChange *change = osync_change_new();

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-ad,v 1.3 2011/11/30 23:48:18 hans Exp $
--- tools/osynctest.c.orig 2007-03-27 20:49:19.000000000 +0900
+++ tools/osynctest.c
@@ -81,8 +81,7 @@ double writetime;
double _second() /* note that some compilers like AIX xlf do not require the trailing '_' */
{
struct timeval tp;
- int rtn;
- rtn=gettimeofday(&tp, NULL);
+ gettimeofday(&tp, NULL);
return ((double)tp.tv_sec+(1.e-6)*tp.tv_usec);
}
@@ -212,7 +211,7 @@ void modify_data(OSyncMember *member, co
const char *de = NULL;
while ((de = g_dir_read_name(dir))) {
- char *filename = g_build_filename(localdir, de, NULL);
+ char *filename = g_build_filename(localdir, de, (char *)NULL);
OSyncChange *change = osync_change_new();
if (!osync_member_make_random_data(member, change, objtype)) {

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-ae,v 1.1 2009/01/10 22:08:46 wiz Exp $
Fix compilation with Sun Studio, which does not provide __FUNCTION__.
--- opensync/opensync_internals.h.orig 2007-03-27 13:49:18.000000000 +0200
+++ opensync/opensync_internals.h
@@ -13,6 +13,10 @@
#include <errno.h>
extern int errno;
+#ifndef __FUNCTION__
+#define __FUNCTION__ __func__
+#endif
+
#define osync_assert(x) do { \
if (!(x)) { \
fprintf(stderr, "%s:%i:E:%s: Assertion \"" #x "\" failed\n", __FILE__, __LINE__, __FUNCTION__); \

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.1 2011/07/21 15:35:55 joerg Exp $
--- tools/osyncstress.c.orig 2011-07-21 15:14:35.000000000 +0000
+++ tools/osyncstress.c
@@ -184,7 +184,7 @@ void change_content(OSyncEngine *engine)
case 2:
if (osync_member_delete_data(meminfo->member, chinfo->change)) {
printf("Deleting data %s for member %lli. Objtype: %s Format: %s\n", osync_change_get_uid(chinfo->change), osync_member_get_id(meminfo->member), osync_objtype_get_name(osync_change_get_objtype(chinfo->change)), osync_objformat_get_name(osync_change_get_objformat(chinfo->change)));
- if (!osync_group_get_slow_sync(engine->group, osync_objtype_get_name(osync_change_get_objtype(chinfo->change))));
+ if (!osync_group_get_slow_sync(engine->group, osync_objtype_get_name(osync_change_get_objtype(chinfo->change))))
chinfo->type = CHANGE_DELETED;
}
break;

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-opensync_opensync_time.c,v 1.1 2011/11/29 15:12:08 hans Exp $
--- opensync/opensync_time.c.orig 2007-03-27 13:49:18.000000000 +0200
+++ opensync/opensync_time.c 2011-11-28 20:41:03.626682362 +0100
@@ -889,16 +889,13 @@ osync_bool osync_time_isdst(const char *
osync_trace(TRACE_ENTRY, "%s(%s, %p)", __func__, vtime, tzid);
int year;
- char *newyear = NULL;
- time_t newyear_t, timestamp;
+ time_t timestamp;
struct tm *std_changetime, *dst_changetime;
time_t dstStamp, stdStamp;
xmlNode *current = NULL;
sscanf(vtime, "%4d%*2d%*2dT%*2d%*d%*2d%*c", &year);
- newyear = g_strdup_printf("%4d0101T000000", year);
- newyear_t = osync_time_vtime2unix(newyear, 0);
timestamp = osync_time_vtime2unix(vtime, 0);
/* Handle XML Timezone field */