*/*: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2016-05-30 05:54:29 +02:00
parent 8ab0635451
commit ea10d3d44d
46 changed files with 2310 additions and 288 deletions

View file

@ -689,6 +689,7 @@
SUBDIR += sidplay
SUBDIR += sidplay2
SUBDIR += sidplayer
SUBDIR += simon
SUBDIR += simplemod
SUBDIR += siren
SUBDIR += skype-call-recorder

31
audio/simon/Makefile Normal file
View file

@ -0,0 +1,31 @@
# Created by: alonso@
# $FreeBSD$
PORTNAME= simon
PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Speech recognition system using sphinx, ALSA and KDE
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libsamplerate.so:audio/libsamplerate \
libpocketsphinx.so:audio/pocketsphinx \
libsphinxad.so:audio/sphinxbase \
libqwt6.so:x11-toolkits/qwt6
USE_KDE4= kdelibs automoc4 pimlibs
USES= cmake:outsource gettext tar:bz2
USE_QT4= accessible corelib dbus gui script testlib xml \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
CMAKE_ARGS+= -DWITH_OpenCV:BOOL=OFF
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>

2
audio/simon/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (KDE/simon-0.4.1.tar.bz2) = 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d
SIZE (KDE/simon-0.4.1.tar.bz2) = 23856024

5
audio/simon/pkg-descr Normal file
View file

@ -0,0 +1,5 @@
Simon is an open source speech recognition program that can replace your
mouse and keyboard. The system is designed to be as flexible as possible
and will work with any language or dialect.
WWW: https://simon.kde.org/

1749
audio/simon/pkg-plist Normal file

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fio
PORTVERSION= 2.10
PORTVERSION= 2.11
CATEGORIES= benchmarks
MASTER_SITES= http://brick.kernel.dk/snaps/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1463932785
SHA256 (fio-2.10.tar.bz2) = 84e8c03691f836e72ab7b18be4d3ab2125e9182c91744761ff48f2bbd94d0112
SIZE (fio-2.10.tar.bz2) = 527456
TIMESTAMP = 1464561760
SHA256 (fio-2.11.tar.bz2) = be0130047a396e7b76a3cd2bd21705e0497807c037bbaeade273a4c3ea9be4af
SIZE (fio-2.11.tar.bz2) = 527395

View file

@ -758,7 +758,6 @@
SUBDIR += py-pickleshare
SUBDIR += py-postgresql
SUBDIR += py-psycogreen
SUBDIR += py-psycopg
SUBDIR += py-psycopg2
SUBDIR += py-psycopg2cffi
SUBDIR += py-pyPgSQL

View file

@ -24,7 +24,7 @@ PORTDOCS= BUGS README TODO
OPTIONS_DEFINE= DOCS MYSQL PGSQL
MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
PGSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/psycopgmodule.so:databases/py-psycopg
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
.include <bsd.port.options.mk>

View file

@ -1,88 +0,0 @@
# Created by: Alex Rodioukov <simuran@shaw.ca>
# $FreeBSD$
PORTNAME= psycopg
PORTVERSION= 1.1.21
PORTREVISION= 1
CATEGORIES= databases python
MASTER_SITES= http://initd.org/psycopg/tarballs/PSYCOPG-1-1/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= psycopg-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= High performance Python adapter for PostgreSQL
DEPRECATED= This port is obsoleted by databases/py-psycopg2. Last consumer of it marked as deprecated
EXPIRATION_DATE= 2016-03-25
RUN_DEPENDS= ${DATETIME_DEP}:lang/py-mx-base
BUILD_DEPENDS= ${DATETIME_DEP}:lang/py-mx-base
USES= gmake pgsql python
GNU_CONFIGURE= yes
ALL_TARGET= sharedmods
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--with-python-version=${PYTHON_VERSION:S/python//} \
--with-postgres-libraries=${LOCALBASE}/lib \
--with-postgres-includes=${LOCALBASE}/include \
--with-mxdatetime-includes=${DATETIME_INC}
OPTIONS_DEFINE= ZOPE DOCS EXAMPLES
OPTIONS_SUB= yes
ZOPE_USES= zope
DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
DATETIME_INC= ${PYTHON_SITELIBDIR}/mx/DateTime/mxDateTime/
DOCSDIR= ${PREFIX}/share/doc/py-psycopg
EXAMPLESDIR= ${PREFIX}/share/examples/py-psycopg
EXAMPLES= binary.py bool.py bounded.py commit.py copy_from.py \
copy_from2.py copy_to.py dictfetch.py dt.py first.py \
integrity.py interval.py notify.py oid.py somehackers.jpg \
threads.py usercast.py whereareyou.jpg work.py
DOCS= AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL NEWS \
README RELEASE-1.0 SUCCESS TODO
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MZOPE}
post-build:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ZPsycopgDA
.endif
do-install:
@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
${INSTALL_PROGRAM} ${WRKSRC}/psycopgmodule.so \
${STAGEDIR}${PYTHON_SITELIBDIR}
.if ${PORT_OPTIONS:MZOPE}
${MKDIR} ${STAGEDIR}${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/ZPsycopgDA
${CP} -R ${WRKSRC}/ZPsycopgDA ${STAGEDIR}${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
.endif
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for f in ${EXAMPLES}
@${INSTALL_DATA} ${WRKSRC}/doc/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
.endfor
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${DOCS}
@${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
.if !defined(BATCH) && ${PORT_OPTIONS:MZOPE}
@${ECHO} ""
@${ECHO} "To complete the installation of ZPsycopgDA:"
@${ECHO} ""
@${ECHO} " - Restart Zope. This may be done from the Zope Control Panel."
@${ECHO} ""
@${ECHO} " - Verify that the ZPsycopgDA product is loaded properly by"
@${ECHO} " examining them in Control_Panel/Products."
@${ECHO} ""
.endif
.include <bsd.port.mk>

View file

@ -1,2 +0,0 @@
SHA256 (psycopg-1.1.21.tar.gz) = f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
SIZE (psycopg-1.1.21.tar.gz) = 213753

View file

@ -1,16 +0,0 @@
psycopg is a PostgreSQL database adapter for the Python programming
language. It was written from scratch with the aim of being very small and
fast, and stable as a rock. The main advantages of psycopg are that it
supports the full Python DBAPI-2.0 and being thread safe at level 2.
psycopg is different from the other database adapter because it was designed
for heavily multi-threaded applications that create and destroy lots of
cursors and make a conspicuous number of concurrent INSERTs or UPDATEs.
Every open Python connection keeps a pool of real (UNIX or TCP/IP)
connections to the database. Every time a new cursor is created, a new
connection does not need to be opened; instead one of the unused connections
from the pool is used. That makes psycopg very fast in typical client-server
applications that create a servicing thread every time a client request
arrives.
WWW: http://initd.org/software/psycopg/

View file

@ -1,55 +0,0 @@
%%PYTHON_SITELIBDIR%%/psycopgmodule.so
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/RELEASE-1.0
%%PORTDOCS%%%%DOCSDIR%%/SUCCESS
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bool.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bounded.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commit.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_from.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_from2.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_to.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dictfetch.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dt.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/first.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integrity.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interval.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oid.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/somehackers.jpg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercast.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whereareyou.jpg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/work.py
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.py
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.pyc
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DABase.py
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DABase.pyc
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/__init__.py
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/__init__.pyc
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/browse.dtml
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/connectionAdd.dtml
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/connectionEdit.dtml
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/db.py
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/db.pyc
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/bin.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/date.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/datetime.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/field.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/float.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/int.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/stable.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/table.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/text.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/time.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/view.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/what.gif
%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/table_info.dtml

View file

@ -19,7 +19,7 @@ BROKEN_ia64= Emacs does not currently build on ia64
CONFLICTS= emacs24-[0-9]* emacs-nox11-[0-9]*
EMACS_VER= 25.0.93
EMACS_VER= 25.0.94
GNU_CONFIGURE= yes
USES= cpe gmake makeinfo ncurses pkgconfig tar:xz
INFO_PATH= ${DATADIR_REL}/info
@ -51,7 +51,7 @@ OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
OPTIONS_GROUP= GRAPHICS NEEDX11
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \
OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \
XWIDGETS
ACL_DESC= Access control list support

View file

@ -1,2 +1,3 @@
SHA256 (emacs-25.0.93.tar.xz) = b39199a491ce53f8b8a5b74fe6f1f191257e424f3ba047b3098ff9218e1579f1
SIZE (emacs-25.0.93.tar.xz) = 42515636
TIMESTAMP = 1463573260
SHA256 (emacs-25.0.94.tar.xz) = c9c45ea7e044585f5b35500edbb356c3a2f4547d441d0d23a5e76722794c6da6
SIZE (emacs-25.0.94.tar.xz) = 42524080

View file

@ -2290,7 +2290,6 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/ielm.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.elc
@dir %%DATADIR%%/%%EMACS_VER%%/lisp/image
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/image-file.el.gz

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= wine
DISTVERSION= 1.9.10
DISTVERSION= 1.9.11
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1463540441
SHA256 (wine-1.9.10.tar.bz2) = 8d4900dff6542c973c3e6112fe23da6d85c28be9a4f842a9d0041e8530861bbf
SIZE (wine-1.9.10.tar.bz2) = 23139814
SHA256 (v1.9.10.tar.gz) = 9f5218622565b00e5caa1026a28bdb2b2756886b1a55fed2f1e64a76b9716046
SIZE (v1.9.10.tar.gz) = 9951778
TIMESTAMP = 1464555493
SHA256 (wine-1.9.11.tar.bz2) = 728f794280fcb5b5d8814e38542d769e2d54ee0d6bf27c7ed74de34fbacdab96
SIZE (wine-1.9.11.tar.bz2) = 23165061
SHA256 (v1.9.11.tar.gz) = 2497b88d2c6ce4e8ea2f149e9f764cf4610b52e521a9c0bf0f56b61668e49c66
SIZE (v1.9.11.tar.gz) = 9960530

View file

@ -1616,6 +1616,7 @@ lib/wine/fakedlls/msxml2.dll
lib/wine/fakedlls/msxml3.dll
lib/wine/fakedlls/msxml4.dll
lib/wine/fakedlls/msxml6.dll
lib/wine/fakedlls/ncrypt.dll
lib/wine/fakedlls/nddeapi.dll
lib/wine/fakedlls/ndis.sys
lib/wine/fakedlls/net.exe
@ -2229,6 +2230,7 @@ lib/wine/msxml2.dll.so
lib/wine/msxml3.dll.so
lib/wine/msxml4.dll.so
lib/wine/msxml6.dll.so
lib/wine/ncrypt.dll.so
lib/wine/nddeapi.dll.so
lib/wine/ndis.sys.so
lib/wine/net.exe.so

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
PORTVERSION= 5.3.1.s20160517
PORTVERSION= 5.3.1.s20160524
CATEGORIES= lang java
MASTER_SITES= GCC/snapshots/${DISTVERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1464119229
SHA256 (gcc-5-20160517.tar.bz2) = c541add7435d316e8b1fb0caf36c56e2a92e08bb8880f0dc81c9b228040e8e75
SIZE (gcc-5-20160517.tar.bz2) = 91301263
TIMESTAMP = 1464558387
SHA256 (gcc-5-20160524.tar.bz2) = 582d23d4a559e3c4e841cea350cb4e15a70747795f1263bc4d8cb72825c5ef5c
SIZE (gcc-5-20160524.tar.bz2) = 91283104

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
PORTVERSION= 201602131907
PORTVERSION= 201605221711
DISTVERSIONSUFFIX= p1
PORTEPOCH= 1
PORTREVISION= 1
@ -19,58 +19,65 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libevent.so:devel/libevent2
OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT
OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT TABLE_DB
OPTIONS_DEFAULT= CA_BUNDLE PAM
OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB
CA_BUNDLE_DESC= Install CA bundle for SSL
LIBASR_DESC= Use stable version of libasr
MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5)
SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port
TABLE_DB_DESC= Build table-db plugin (aliases)
USES= cpe libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-table-db \
--sysconfdir=${PREFIX}/etc/mail/ \
--with-libasr=${LOCALBASE} \
--with-libevent=${LOCALBASE} \
--with-libssl=${OPENSSLBASE} \
--with-group-queue=${GROUPS}
USE_RC_SUBR= smtpd
SUB_FILES= pkg-install pkg-deinstall
CPE_VENDOR= openbsd
USE_RC_SUBR= smtpd
SUB_FILES= pkg-install pkg-deinstall pkg-message
CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]*
USERS= _smtpd _smtpq
GROUPS= _smtpd
GROUPS= _smtpd _smtpq
PLIST_SUB+= SMTPQ_GROUP=${GROUPS}
OPTIONS_SUB= yes
LIBASR_LIB_DEPENDS_OFF= libasr.so:dns/libasr-devel
LIBASR_LIB_DEPENDS= libasr.so:dns/libasr
OPTIONS_SUB= yes
CA_BUNDLE_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
LIBASR_LIB_DEPENDS= libasr.so:dns/libasr
LIBASR_LIB_DEPENDS_OFF= libasr.so:dns/libasr-devel
PAM_CONFIGURE_WITH= auth-pam=smtpd
SSL_PORT_VARS= with_openssl_port=yes
TABLE_DB_CONFIGURE_WITH= table-db
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT}
.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015
WITH_OPENSSL_PORT= yes
.endif
.if ${PORT_OPTIONS:MSSL_PORT}
WITH_OPENSSL_PORT= yes
.endif
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \
--with-libevent=${LOCALBASE} \
--with-libssl=${OPENSSLBASE} \
--sysconfdir=${PREFIX}/etc/mail/
post-patch:
${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
# https://github.com/OpenSMTPD/OpenSMTPD/issues/700
${REINPLACE_CMD} -r -e \
'/SMTPD_VERSION/s/"[^"]+"$$/"${PORTVERSION}${DISTVERSIONSUFFIX}"/' \
${WRKSRC}/smtpd/smtpd.h
.if ${PORT_OPTIONS:MTABLE_DB}
post-install:
@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
SHA256 (opensmtpd-201602131907p1.tar.gz) = 0fd10cff59719523e41fe489ff5c1490c2898a2ce47b98e4bf39f07ba3562252
SIZE (opensmtpd-201602131907p1.tar.gz) = 686726
SHA256 (opensmtpd-201605221711p1.tar.gz) = e7f63a4d5c26386cffe61f35d6e4a959a1f6f38b3fbe0351c746326cf2329418
SIZE (opensmtpd-201605221711p1.tar.gz) = 691693

View file

@ -1,9 +1,10 @@
--- mk/smtpd/Makefile.in.orig 2016-02-07 00:04:24 UTC
--- mk/smtpd/Makefile.in.orig 2016-02-02 20:40:51 UTC
+++ mk/smtpd/Makefile.in
@@ -1339,12 +1339,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
$(MKDIR_P) $(DESTDIR)$(bindir)
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-
- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
- else \

View file

@ -1,52 +0,0 @@
diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c
index 3a0ca2a..404ee50 100644
--- smtpd/smtp_session.c
+++ smtpd/smtp_session.c
@@ -84,6 +84,7 @@ enum session_flags {
SF_BADINPUT = 0x0080,
SF_FILTERCONN = 0x0100,
SF_FILTERDATA = 0x0200,
+ SF_USERTOOLONG = 0x0400,
};
enum message_flags {
@@ -990,6 +991,15 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
s = tree_xpop(&wait_parent_auth, reqid);
strnvis(user, s->username, sizeof user, VIS_WHITE | VIS_SAFE);
+
+ if (s->flags & SF_USERTOOLONG) {
+ log_info("smtp-in: sesson %016"PRIx64
+ ": auth failed because username too long",
+ s->id);
+ s->flags &= (~SF_USERTOOLONG);
+ success = LKA_PERMFAIL;
+ }
+
if (success == LKA_OK) {
log_info("smtp-in: session %016"PRIx64
": authentication successful for user %s ",
@@ -1929,7 +1939,7 @@ smtp_rfc4954_auth_plain(struct smtp_session *s, char *arg)
user++; /* skip NUL */
if (strlcpy(s->username, user, sizeof(s->username))
>= sizeof(s->username))
- goto abort;
+ s->flags |= SF_USERTOOLONG;
pass = memchr(user, '\0', len - (user - buf));
if (pass == NULL || pass >= buf + len - 2)
@@ -1969,9 +1979,12 @@ smtp_rfc4954_auth_login(struct smtp_session *s, char *arg)
case STATE_AUTH_USERNAME:
memset(s->username, 0, sizeof(s->username));
- if (base64_decode(arg, (unsigned char *)s->username,
- sizeof(s->username) - 1) == -1)
+ if (base64_decode(arg, (unsigned char *)buf,
+ sizeof(buf) - 1) == -1)
goto abort;
+ if (strlcpy(s->username, buf, sizeof(s->username))
+ >= sizeof(s->username))
+ s->flags |= SF_USERTOOLONG;
smtp_enter_state(s, STATE_AUTH_PASSWORD);
smtp_reply(s, "334 UGFzc3dvcmQ6");

View file

@ -1,15 +1,15 @@
@sample etc/mail/smtpd.conf.sample
libexec/opensmtpd/encrypt
libexec/opensmtpd/mail.local
libexec/opensmtpd/makemap
@(,%%SMTPQ_GROUP%%,2555) sbin/smtpctl
%%TABLE_DB%%libexec/opensmtpd/makemap
@(,,2555) sbin/smtpctl
sbin/smtpd
man/man5/aliases.5.gz
man/man5/forward.5.gz
man/man5/smtpd.conf.5.gz
man/man5/table.5.gz
man/man8/makemap.8.gz
man/man8/newaliases.8.gz
%%TABLE_DB%%man/man8/makemap.8.gz
%%TABLE_DB%%man/man8/newaliases.8.gz
man/man8/sendmail.8.gz
man/man8/smtpctl.8.gz
man/man8/smtpd.8.gz

View file

@ -150,6 +150,7 @@
SUBDIR += ramblercontacts
SUBDIR += ricochet
SUBDIR += ring-daemon
SUBDIR += ring-gnome
SUBDIR += ring-libclient
SUBDIR += rubygem-earthquake
SUBDIR += rubygem-hipchat

View file

@ -0,0 +1,52 @@
# Created by: Yuri Victorovich <yuri@rawbw.com>
# $FreeBSD$
PORTNAME= ring-gnome
PORTVERSION= 0.160516
#DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@rawbw.com
COMMENT= Gnome client of the Ring VoIP SIP phone and IM
LICENSE= GPLv3
LICENSE_FILES= ${WRKSRC}/COPYING
LIB_DEPENDS= libringclient.so:net-im/ring-libclient \
libqrencode.so:graphics/libqrencode \
libcogl-pango.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libnotify.so:devel/libnotify \
libsoup-2.4.so:devel/libsoup \
libplc4.so:devel/nspr \
libjson-glib-1.0.so:devel/json-glib \
libnss3.so:security/nss \
libsecret-1.so:security/libsecret \
libebook-1.2.so:databases/evolution-data-server
BROKEN_FreeBSD_9= Fails due to compiler issues
USE_GITHUB= yes
GH_TUPLE+= savoirfairelinux:ring-client-gnome:07107e9
SUB_FILES= pkg-message
USES= cmake compiler:c++14-lang gettext gmake pkgconfig shebangfix sqlite
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 libxml2 gtk30
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xscrnsaver
USE_GL= gl egl
USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
concurrent buildtools_build linguisttools_build qmake_build
SHEBANG_FILES= ${WRKSRC}/src/ring.cx
INSTALLS_ICONS= yes
OPTIONS_DEFINE= NLS
NLS_CMAKE_ON= -DFREEBSD_NLS_ON:BOOL=ON
OPTIONS_SUB= yes
post-stage:
@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svgz
@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg
.include <bsd.port.mk>

View file

@ -0,0 +1,3 @@
TIMESTAMP = 1463424510
SHA256 (savoirfairelinux-ring-client-gnome-0.160516-07107e9_GH0.tar.gz) = 14df8601b6520f9040321efb366d33d59a3c139b98acd6b69be0a519e99bdc60
SIZE (savoirfairelinux-ring-client-gnome-0.160516-07107e9_GH0.tar.gz) = 677210

View file

@ -0,0 +1,30 @@
--- CMakeLists.txt.orig 2016-05-06 14:35:17 UTC
+++ CMakeLists.txt
@@ -11,7 +11,7 @@ IF (CMAKE_COMPILER_IS_GNUCC)
ENDIF()
ENDIF()
-ADD_DEFINITIONS("-std=c++1y")
+set(CMAKE_CXX_FLAGS "-std=c++1y")
# set project name and version
PROJECT(ring-client-gnome)
@@ -306,7 +306,10 @@ GLIB_COMPILE_RESOURCES( GLIB_RESOURCES_R
# ADD_SUBDIRECTORY( src/test)
# ENDIF()
+option(FREEBSD_NLS_ON "NLS option: install translations" OFF)
+
# for translations
+IF (FREEBSD_NLS_ON)
IF (GETTEXT_FOUND)
# get all translation files; they're expected to be named using the following convention:
@@ -331,6 +334,7 @@ IF (GETTEXT_FOUND)
ENDFOREACH(PO_FILE)
ENDIF(GETTEXT_FOUND)
+ENDIF(FREEBSD_NLS_ON)
# install and compile glib gsettings schema
add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)

View file

@ -0,0 +1,10 @@
======================================================================
You installed the Ring softphone and IM Gnome client.
Ring is currently in beta, and might not always function as expected.
It will only work when pulseaudio server is running.
For video to work you need to make sure that your webcam is available
through the V4L interface.
======================================================================

View file

@ -0,0 +1,5 @@
Ring is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power
of privacy in the hands of the user.
WWW: https://ring.cx/

View file

@ -0,0 +1,34 @@
bin/gnome-ring
bin/ring.cx
share/appdata/gnome-ring.appdata.xml
share/applications/gnome-ring.desktop
share/glib-2.0/schemas/cx.ring.RingGnome.gschema.xml
share/gnome-ring/gnome-ring.desktop
share/icons/hicolor/scalable/apps/ring.svgz
%%NLS%%share/locale/ar/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/bg/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ca/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/cs_CZ/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/da_DK/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/de/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/eo/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/es/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fa_IR/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fr_CA/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/he/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/hr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/id/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/lt/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/nl/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pa/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pl/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pt/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ru/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/sv/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/tr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/uk/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/zh/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ring-client-gnome.mo

View file

@ -29,8 +29,8 @@ ONLY_FOR_ARCHS_REASON= Not supported on other architectures, amd64 only.
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 1002000
IGNORE= is not supported on FreeBSD 10.1 and older
.if ${OSVERSION} < 1001000
IGNORE= is not supported on FreeBSD 10.0 and older
.endif
.if ${OSVERSION} >= 1100000

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= clamav
PORTVERSION= 0.99.1
PORTVERSION= 0.99.2
CATEGORIES= security
MASTER_SITES= http://www.clamav.net/downloads/production/

View file

@ -1,2 +1,2 @@
SHA256 (clamav-0.99.1.tar.gz) = e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a
SIZE (clamav-0.99.1.tar.gz) = 15990867
SHA256 (clamav-0.99.2.tar.gz) = 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a
SIZE (clamav-0.99.2.tar.gz) = 16067497

View file

@ -36,8 +36,8 @@ NVMUPDATE_DIR= intel-nvmupdate
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 1002000
IGNORE= is not supported on FreeBSD 10.1 and older
.if ${OSVERSION} < 1001000
IGNORE= is not supported on FreeBSD 10.0 and older
.endif
.if ${OSVERSION} >= 1100000

View file

@ -3,7 +3,8 @@
PORTNAME= qtpass
PORTVERSION= 1.1.1
DISTVERSIONPREFIX=v
CATEGORIES=sysutils
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= brouwer@annejan.com
COMMENT= Qt GUI for pass, the standard unix password manager
@ -12,14 +13,29 @@ LICENSE= GPLv3
RUN_DEPENDS= pass:sysutils/password-store
USES= qmake
USES= qmake:outsource
USE_GITHUB= yes
GH_ACCOUNT= IJhack
USE_QT5= buildtools core gui linguisttools network widgets
USE_QT5= buildtools_build core gui linguisttools_build network widgets
USE_GL= gl
PLIST_FILES= bin/qtpass
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/qtpass ${STAGEDIR}${PREFIX}/bin
PLIST_FILES= bin/qtpass \
share/pixmaps/qtpass.png
# Create a desktop entry for the port.
DESKTOP_ENTRIES= "QtPass" "" \
"${PREFIX}/share/pixmaps/qtpass.png" \
"${PREFIX}/bin/qtpass" \
"Security;Utility;" true
post-patch:
# The project file assumes PREFIX is the bin-dir. We pass PREFIX=${LOCALBASE}
# so we have to append bin to target.path.
${REINPLACE_CMD} -e '/target.path/s,$$,bin,' ${WRKSRC}/qtpass.pro
# Install the icon of the port.
post-install:
${INSTALL_DATA} ${WRKSRC}/artwork/icon.png \
${STAGEDIR}${PREFIX}/share/pixmaps/qtpass.png
.include <bsd.port.mk>

View file

@ -4,7 +4,7 @@
PORTNAME= uhidd
PORTVERSION= 0.2.1
DISTVERSIONPREFIX= REL-
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
MAINTAINER= jbeich@FreeBSD.org

View file

@ -0,0 +1,286 @@
commit ea1925e
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Sun May 29 16:13:33 2016 +0000
Drop unused /dev/ prefix to unbreak FreeBSD 11.0
uhidd.c:291:16: error: passing 'const char *' to parameter of type 'char *' discards qualifiers
[-Werror,-Wincompatible-pointer-types-discards-qualifiers]
basename(hi->dev));
^~~~~~~
/usr/include/libgen.h:38:22: note: passing argument to parameter here
char *basename(char *);
^
--- uhidd/uhidd.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd.c
@@ -174,7 +174,7 @@ main(int argc, char **argv)
STAILQ_INIT(&hilist);
- if (find_device(*argv) < 0) {
+ if (find_device(basename(*argv)) < 0) {
eval = 1;
goto uhidd_end;
}
@@ -231,7 +231,7 @@ create_runtime_dir(void)
hi = STAILQ_FIRST(&hilist);
if (hi != NULL && hi->dev != NULL) {
snprintf(dpath, sizeof(dpath), "/var/run/uhidd.%s",
- basename(hi->dev));
+ hi->dev);
mkdir(dpath, 0755);
}
}
@@ -247,7 +247,7 @@ remove_runtime_dir(void)
hi = STAILQ_FIRST(&hilist);
if (hi != NULL && hi->dev != NULL) {
snprintf(dpath, sizeof(dpath), "/var/run/uhidd.%s",
- basename(hi->dev));
+ hi->dev);
if ((dir = opendir(dpath)) != NULL) {
while ((d = readdir(dir)) != NULL) {
snprintf(fpath, sizeof(fpath), "%s/%s", dpath,
@@ -286,7 +286,7 @@ find_device(const char *dev)
unsigned int bus, addr;
int ret;
- if (sscanf(dev, "/dev/ugen%u.%u", &bus, &addr) < 2) {
+ if (sscanf(dev, "ugen%u.%u", &bus, &addr) < 2) {
syslog(LOG_ERR, "%s not found", dev);
return (-1);
}
@@ -405,7 +405,7 @@ open_iface(const char *dev, struct libus
e = libusb20_dev_request_sync(pdev, &req, rdesc, &actlen, 0, 0);
if (e) {
syslog(LOG_ERR, "%s[%d]=> libusb20_dev_request_sync"
- " failed", basename(dev), ndx);
+ " failed", dev, ndx);
return;
}
@@ -497,7 +497,7 @@ alloc_hid_interface_be(struct hid_interf
assert(hi != NULL);
- if (sscanf(hi->dev, "/dev/ugen%u.%u", &bus, &addr) < 2) {
+ if (sscanf(hi->dev, "ugen%u.%u", &bus, &addr) < 2) {
syslog(LOG_ERR, "%s not found", hi->dev);
return (-1);
}
@@ -547,7 +547,7 @@ start_hid_interface(void *arg)
xfer = libusb20_tr_get_pointer(hi->pdev, x);
if (xfer == NULL) {
syslog(LOG_ERR, "%s[%d] libusb20_tr_get_pointer failed\n",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
goto parent_end;
}
@@ -556,7 +556,7 @@ start_hid_interface(void *arg)
PRINT1("xfer already opened\n");
} else if (e) {
syslog(LOG_ERR, "%s[%d] libusb20_tr_open failed\n",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
goto parent_end;
}
@@ -628,14 +628,14 @@ hid_interrupt_out(void *context, int rep
xfer = libusb20_tr_get_pointer(hi->pdev, x);
if (xfer == NULL) {
syslog(LOG_ERR, "%s[%d] libusb20_tr_get_pointer failed\n",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
e = libusb20_tr_open(xfer, 4096, 1, XXX); /* FIXME */
if (e && e != LIBUSB20_ERROR_BUSY) {
syslog(LOG_ERR, "%s[%d] libusb20_tr_open failed\n",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
@@ -720,12 +720,12 @@ hid_set_report(void *context, int report
e = libusb20_dev_request_sync(hi->pdev, &req, buf, &actlen, 0, 0);
if (e && verbose)
syslog(LOG_ERR, "%s[%d] libusb20_dev_request_sync failed",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
try++;
} while (e && try < _SET_REPORT_RETRY);
if (e) {
syslog(LOG_ERR, "%s[%d] libusb20_dev_request_sync failed",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
if (verbose) {
--- uhidd/uhidd.h.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd.h
@@ -227,7 +227,7 @@ struct hid_interface {
do { \
char pb[64], pb2[1024]; \
\
- snprintf(pb, sizeof(pb), "%s[%d]", basename(d), n); \
+ snprintf(pb, sizeof(pb), "%s[%d]", d, n); \
snprintf(pb2, sizeof(pb2), __VA_ARGS__); \
printf("%s-> %s", pb, pb2); \
} while (0);
@@ -236,7 +236,7 @@ struct hid_interface {
do { \
char pb[64], pb2[1024]; \
\
- snprintf(pb, sizeof(pb), "%s[%d]", basename(hi->dev), \
+ snprintf(pb, sizeof(pb), "%s[%d]", hi->dev, \
hi->ndx); \
snprintf(pb2, sizeof(pb2), __VA_ARGS__); \
printf("%s-> %s", pb, pb2); \
--- uhidd/uhidd_cc.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd_cc.c
@@ -175,11 +175,11 @@ cc_write_keymap_file(struct hid_interfac
int i;
snprintf(fpath, sizeof(fpath), "/var/run/uhidd.%s/cc_keymap",
- basename(hi->dev));
+ hi->dev);
fp = fopen(fpath, "w+");
if (fp == NULL) {
syslog(LOG_ERR, "%s[%d] fopen %s failed: %m",
- basename(hi->dev), hi->ndx, fpath);
+ hi->dev, hi->ndx, fpath);
return;
}
fprintf(fp, "0x%04x:0x%04x={\n", hi->vendor_id, hi->product_id);
--- uhidd/uhidd_kbd.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd_kbd.c
@@ -582,7 +582,7 @@ kbd_attach(struct hid_appcol *ha)
/* Open /dev/vkbdctl. */
if ((kd->vkbd_fd = open("/dev/vkbdctl", O_RDWR)) < 0) {
syslog(LOG_ERR, "%s[%d] could not open /dev/vkbdctl: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
if (verbose && errno == ENOENT)
PRINT1("vkbd.ko kernel module not loaded?\n")
return (-1);
@@ -591,7 +591,7 @@ kbd_attach(struct hid_appcol *ha)
if (verbose) {
if (fstat(kd->vkbd_fd, &sb) < 0) {
syslog(LOG_ERR, "%s[%d] fstat: /dev/vkbdctl: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
PRINT1("kbd device name: %s\n", devname(sb.st_rdev, S_IFCHR));
--- uhidd/uhidd_mouse.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd_mouse.c
@@ -91,7 +91,7 @@ mouse_attach(struct hid_appcol *ha)
md->cons_fd = open("/dev/consolectl", O_RDWR);
if (md->cons_fd < 0) {
syslog(LOG_ERR, "%s[%d] could not open /dev/consolectl: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
@@ -212,5 +212,5 @@ mouse_recv(struct hid_appcol *ha, struct
if (ioctl(md->cons_fd, CONS_MOUSECTL, &mi) < 0)
syslog(LOG_ERR, "%s[%d] could not submit mouse data:"
- " ioctl failed: %m", basename(hi->dev), hi->ndx);
+ " ioctl failed: %m", hi->dev, hi->ndx);
}
--- uhidd/uhidd_vhid.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd_vhid.c
@@ -97,7 +97,7 @@ vhid_attach(struct hid_appcol *ha)
*/
if ((vd->vd_fd = open("/dev/uvhidctl", O_RDWR)) < 0) {
syslog(LOG_ERR, "%s[%d] could not open /dev/uvhidctl: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
if (verbose && errno == ENOENT)
PRINT1("uvhid.ko kernel moduel not loaded?\n")
return (-1);
@@ -105,13 +105,13 @@ vhid_attach(struct hid_appcol *ha)
if (fstat(vd->vd_fd, &sb) < 0) {
syslog(LOG_ERR, "%s[%d] fstat: /dev/uvhidctl: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
close(vd->vd_fd);
return (-1);
}
if ((vd->vd_name = strdup(devname(sb.st_rdev, S_IFCHR))) == NULL) {
- syslog(LOG_ERR, "%s[%d] strdup failed: %m", basename(hi->dev),
+ syslog(LOG_ERR, "%s[%d] strdup failed: %m", hi->dev,
hi->ndx);
close(vd->vd_fd);
return (-1);
@@ -129,7 +129,7 @@ vhid_attach(struct hid_appcol *ha)
if (ioctl(vd->vd_fd, USB_SET_REPORT_DESC, &ugd) < 0) {
syslog(LOG_ERR, "%s[%d] ioctl(USB_SET_REPORT_DESC): %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
@@ -148,7 +148,7 @@ vhid_attach(struct hid_appcol *ha)
if (ioctl(vd->vd_fd, USB_SET_REPORT_ID, &vd->vd_rid) < 0) {
syslog(LOG_ERR, "%s[%d] ioctl(USB_SET_REPORT_ID): %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
@@ -156,7 +156,7 @@ vhid_attach(struct hid_appcol *ha)
e = pthread_create(&vd->vd_task, NULL, vhid_task, (void *) ha);
if (e) {
syslog(LOG_ERR, "%s[%d] pthread_create failed: %m",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
close(vd->vd_fd);
return (-1);
}
@@ -189,7 +189,7 @@ vhid_recv_raw(struct hid_appcol *ha, uin
}
if (write(vd->vd_fd, buf, len) < 0)
- syslog(LOG_ERR, "%s[%d] write failed: %m", basename(hi->dev),
+ syslog(LOG_ERR, "%s[%d] write failed: %m", hi->dev,
hi->ndx);
}
@@ -217,7 +217,7 @@ vhid_task(void *arg)
continue;
}
if (verbose) {
- PRINT1("%s[%d] vhid_task recevied:", basename(hi->dev),
+ PRINT1("%s[%d] vhid_task recevied:", hi->dev,
hi->ndx);
for (i = 0; i < len; i++)
printf("%d ", buf[i]);
--- uhidd/uhidd_vhid_cuse.c.orig 2012-10-14 19:53:44 UTC
+++ uhidd/uhidd_vhid_cuse.c
@@ -192,7 +192,7 @@ vhid_attach(struct hid_appcol *ha)
vd->vd_rsz = ha->ha_rsz;
} else {
syslog(LOG_ERR, "%s[%d] report descriptor too big!",
- basename(hi->dev), hi->ndx);
+ hi->dev, hi->ndx);
return (-1);
}
@@ -468,7 +468,7 @@ vhid_write(struct cuse_dev *cdev, int ff
goto write_done;
if (verbose) {
- PRINT1("%s[%d] vhid_task recevied:", basename(hi->dev),
+ PRINT1("%s[%d] vhid_task recevied:", hi->dev,
hi->ndx);
for (i = 0; i < len; i++)
printf("%d ", buf[i]);

View file

@ -1222,11 +1222,11 @@
SUBDIR += py-chardet
SUBDIR += py-cloud_sptheme
SUBDIR += py-creole
SUBDIR += py-curator
SUBDIR += py-dbfread
SUBDIR += py-diff-match-patch
SUBDIR += py-docutils
SUBDIR += py-dsv
SUBDIR += py-elasticsearch-curator-py
SUBDIR += py-elasticsearch-dsl-py
SUBDIR += py-elasticsearch-py
SUBDIR += py-elib.intl

View file

@ -1,2 +0,0 @@
SHA256 (elastic-curator-v3.4.0_GH0.tar.gz) = 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605
SIZE (elastic-curator-v3.4.0_GH0.tar.gz) = 96741

View file

@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= curator
PORTVERSION= 3.4.0
PORTVERSION= 3.5.1
DISTVERSIONPREFIX= v
CATEGORIES= textproc python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}elasticsearch-
PKGNAMESUFFIX= -py
MAINTAINER= dvl@FreeBSD.org
COMMENT= Python index manager for Elasticsearch

View file

@ -0,0 +1,2 @@
SHA256 (elastic-curator-v3.5.1_GH0.tar.gz) = 3b578c1d8a88da22501a79346792288478f3191d75058e4c43d05fc261c9b874
SIZE (elastic-curator-v3.5.1_GH0.tar.gz) = 93121

View file

@ -25,7 +25,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
.endif
.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPRREFIX}psycopg>0:databases/py-psycopg
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
.endif
.if ${PORT_OPTIONS:MMYSQL}