Is MAINTAINER compulsory in Makefile
Hello, I am about to have my Racket port ready tested and I wish it could get included into the ports tree. Is it compulsory to set the MAINTAINER variable? I mean, I am reading ports@openbsd.org daily and I would notice any response. The reason why I am asking is that I would want to avoid as much spam as possible. Everything that is directed to ports@ is easy to filter into an own folder, but spam directed to me is more difficult to filter. I would not want to create even more email accounts. I have already several that I need to check. regards, Lasse
NEW: net/sslh
Attached is a port of sslh, a ssl/ssh multiplexer. This tool accepts HTTPS, SSH, OpenVPN, tinc and XMPP connections on the same port. This makes it possible to connect to any of these servers on port 443 (e.g. from inside a corporate firewall, which almost never block port 443) while still serving HTTPS on that port. homepage: http://www.rutschle.net/tech/sslh.shtml ok? -- Björn Ketelaars sslh.tgz Description: Binary data
Hoje são até 92% menos em Progressiva Agimax / Rodízio de Sushi / Spa de Pés e Mãos / Torre de Chopp Itaipava / Alu =?utf-8?B?Z3VlbCBkZSBCcmlucXVlZG9zIC8gR
www.incriveisofertas.com [IMAGE] Progressiva da Agimax + �mpola de Hidrata��o P�s Quim�ca ( De R$ 250 Por R$ 69,90 ) Compre at� 3! de R$ 250,00 por R$ R$ 69,90 [IMAGE] Loucura! 1 Rod�zio de Sushi + Entrada + YakiSob� no Sushi Express, 3 lojas em Campo Grande + de 30 tipos de Sushi! Aproveite e Compre. de R$ 29,90 por R$ R$ 19,90 [IMAGE] Luxo de Spa para P�s e M�os! Manicure + Pedicure + Hidrata��o Profunda com Bota T�rmica + Peeling de Diamante no P� e M�o ( De R$ 83 por R$ 14,90 ) de R$ 83,00 por R$ R$ 14,90 [IMAGE] Incr�vel Fa�a a Festa para seus Filhos! Cama Elastica + Piscina de Bolinha + Gangorra + Escorregador + 6 meses para usar ( De R$400 Por R$99,90 ) de R$ 400,00 por R$ R$ 99,90 [IMAGE] Relaxe com Day Use na Est�ncia Vov� Ded� por s� R$15 use S�bados, Domingos e Feriados - Garanta seu Cupom! de R$ 30,00 por R$ R$ 15,00 [IMAGE] 80% OFF em 1 Escova Definitiva + Limpeza Facial com �rgila ( De R$ 450 Por R$ 89,90 ) - Compre j�! de R$ 450,00 por R$ R$ 89,90 [IMAGE] 92 % OFF em 21 Tratamentos Corporais, na Oficina do Corpo ( De R$600 Por 49,90 ) de R$ 600,00 por R$ R$ 49,90 [IMAGE] �ltimos Dias!!! 1 Torre de Chopp Itaipava no Mi�a Bar s� R$13,90 ao inv�s de R$35,00 - Curta seu Happy Hour com Super Desconto! de R$ 35,00 por R$ R$ 13,90 [IMAGE] Depila��o de Axilas + Bu�o ( De R$ 15 Por R$ 5 ) Compre seu Cupom. de R$ 15,00 por R$ R$ 5,00 Ofertas Especiais de campo Grande! Siga-nos na redes sociais Facebook Curta-nos!Siga-nos! Utilizamos Sistema de Compra Segura! Sua Compra Protegida! Oferta Delas [IMAGE] Porque voc� recebeu esse e-mail? Este e-mail foi enviado pela Oferta Delas porque voc� possui cadastro conosco ou em algum site parceiro, juntamente com a permis�o para contat�-lo. Pra que futuras ofertas da Oferta Delas sejam entregues na sua caixa de entrada e n�o sejam tratados como spam, por favor adicione bole...@querohost.com.br � sua lista de contatos ou lista de remetentes aprovados. [IMAGE] Pol�tica de Privacidade N�s queremos que voc� se sinta confiante sobre a privacidade de suas informa��es pessoais, assim como todas as informa��es que temos sobre voc� est�o protegidas. [IMAGE] Não desejo mais receber estes e-mails.
Re: UPDATE: games/abuse
On Wednesday 21 March 2012 02:43:04 Brad Smith wrote:
> On 09/03/12 4:18 PM, Antti Harri wrote:
> > Update to 0.8:
> >
> > Frabs was reorganized and put into main distribution in
> > upstream so remove here.
> >
> > Bundle abuse-free-sounds-20120309 that has free sounds
> > we can package. Most of the sounds that matter are available.
>
> Working fine on amd64.
Thanks.
Data was restructured upstream and I noticed there is a potential problem when
upgrading from a previous version because the game writes default user config
on initial startup having datapath enabled. I commented this out in the config
template so it won't happen in future versions, but people upgrading from 0.7.x
might need to tweak their ~/.abuse/abuserc file and comment out the entry.
Fixed diff attached. Could someone commit this please?
--
Antti Harri
diff --git games/abuse/Makefile games/abuse/Makefile
index f22cf3d..37be9a6 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -2,61 +2,73 @@
COMMENT = SDL port of the legendary 2D platform shooter
-DISTNAME = abuse-0.7.1
-REVISION = 1
+DISTNAME = abuse-free-0.8
+PKGNAME = abuse-0.8
EPOCH =0
-ABUSE_FRABS = abuse-frabs-2.11
+ABUSE_SFX =abuse-free-sounds-20120309
CATEGORIES = games x11
HOMEPAGE = http://abuse.zoy.org/
MAINTAINER = Antti Harri
-# GPLv2 and public domain
+# Abuse: GPLv2 and public domain
+# Abuse-free-sounds: various free licenses
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
- Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
+WANTLIB += FLAC GL SDL SDL_mixer X11 Xdamage Xext Xfixes Xrandr
+WANTLIB += Xrender Xxf86vm c drm iconv m mikmod ogg pthread smpeg
+WANTLIB += sndio stdc++ usbhid vorbis vorbisfile xcb
-MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/
+MASTER_SITES0 =http://openbsd.fi/dist/
MODULES = converters/libiconv
# Needs AC_PROG_LIBTOOL
BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS = devel/sdl
-
-DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
-EXTRACT_ONLY = ${DISTNAME}.tar.gz
-
+RUN_DEPENDS = audio/timidity
+LIB_DEPENDS = devel/sdl-mixer \
+ devel/smpeg \
+ audio/flac \
+ audio/libogg \
+ audio/libmikmod \
+ audio/libvorbis
+
+DISTFILES =${DISTNAME}.tar.gz \
+ ${ABUSE_SFX}.tar.gz:0
+
+SEPARATE_BUILD =Yes
USE_LIBTOOL = Yes
-AUTOCONF_VERSION = 2.61
-AUTOMAKE_VERSION = 1.10
CONFIGURE_STYLE = gnu
-
-CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ARGS = --enable-release \
+ --disable-nonfree \
+ --with-assetdir=${PREFIX}/share/abuse \
+ --datadir=${PREFIX}/share/abuse
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
NO_REGRESS = Yes
-DATADIR = ${PREFIX}/share/abuse/frabs
-SUBST_VARS = DATADIR
+
+post-patch:
+ cd "${WRKSRC}" && \
+ find "${WRKDIR}/${ABUSE_SFX}/patches/" -name 'patch-*' \
+ -exec patch -z .afs-orig -i {} \;
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
- cd ${WRKSRC}; \
+ cd ${WRKSRC} && \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
post-install:
- cd ${PREFIX}/share/abuse && \
- gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
- tar xf - && \
- mv ${ABUSE_FRABS} frabs
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
+ cd ${WRKDIR}/${ABUSE_SFX}/sfx && find . -type f -exec \
+ ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
.include
diff --git games/abuse/distinfo games/abuse/distinfo
index 8e287f9..46e44922 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
-MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
-RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
-RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
-SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
-SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
-SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
-SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
-SIZE (abuse-0.7.1.tar.gz) = 719285
-SIZE (abuse-frabs-2.11.tar.gz) = 4819133
+MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
+MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
+RMD160 (abuse-free-0.8.tar.gz) = ZhwF/H/nkMmwn8
Re: UPDATE: games/xmoto
On Tue, Mar 20, 2012 at 04:02:15PM +0200, Antti Harri wrote: > Update to xmoto's newest release. Tested on i386. All works perfect. -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: games/abuse
On 09/03/12 4:18 PM, Antti Harri wrote: Update to 0.8: Frabs was reorganized and put into main distribution in upstream so remove here. Bundle abuse-free-sounds-20120309 that has free sounds we can package. Most of the sounds that matter are available. Working fine on amd64. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: maradns-deadwood
On Tue, Mar 20, 2012 at 7:44 PM, Stuart Henderson wrote: > On 2012/03/20 22:32, Stuart Henderson wrote: >> "Deadwood is the recursive DNS daemon (service) for MaraDNS 2.0. >> MaraDNS 2.0 uses separate programs for authoritative records >> (maradns) and recursive records (Deadwood). Deadwood is a >> standalone recursive server that can either be used in >> conjunction with MaraDNS's authoritative server, or by itself." >> >> any comments? OK? >> > > on second thoughts, let's enable the ipv6 support... new diff attached > it is running fine here. works both ipv4 and ipv6 support. just a tweak: could you switch from INSTALL_DATA to INSTALL_MAN Deadwood.1 in Makefile ? otherwise OK with me.
Re: maradns-deadwood
On 2012/03/20 22:32, Stuart Henderson wrote: > "Deadwood is the recursive DNS daemon (service) for MaraDNS 2.0. > MaraDNS 2.0 uses separate programs for authoritative records > (maradns) and recursive records (Deadwood). Deadwood is a > standalone recursive server that can either be used in > conjunction with MaraDNS's authoritative server, or by itself." > > any comments? OK? > on second thoughts, let's enable the ipv6 support... new diff attached maradns-deadwood.tgz Description: application/tar-gz
maradns-deadwood
"Deadwood is the recursive DNS daemon (service) for MaraDNS 2.0. MaraDNS 2.0 uses separate programs for authoritative records (maradns) and recursive records (Deadwood). Deadwood is a standalone recursive server that can either be used in conjunction with MaraDNS's authoritative server, or by itself." any comments? OK? maradns-deadwood.tgz Description: application/tar-gz
quagga test wanted
In quagga 0.99.20 various things were changed with the multicast code
and it no longer builds as-is on OpenBSD.
Is there anyone around running quagga with multicast protocols
(ospf etc) on OpenBSD who could try running the diff below?
Alternatively a tarred up /etc/quagga might be enough for me to
test it here.
You will need a totally up-to-date cvs checkout for this diff
to apply.
Index: Makefile
===
RCS file: /cvs/ports/net/quagga/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile20 Mar 2012 20:56:26 - 1.25
+++ Makefile20 Mar 2012 21:31:55 -
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2012/03/20 20:56:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2012/01/17 17:22:56 sthen Exp $
COMMENT= multi-threaded routing daemon
-DISTNAME= quagga-0.99.19
-REVISION= 3
+DISTNAME= quagga-0.99.20.1
SHARED_LIBS= ospf0.0 \
ospfapiclient 0.0 \
zebra 0.0
@@ -28,7 +27,8 @@ USE_GMAKE=Yes
USE_LIBTOOL= Yes
SYSCONFDIR=${BASESYSCONFDIR}/quagga
SEPARATE_BUILD=concurrent
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.68
CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/quagga \
--localstatedir=${STATEDIR} \
--enable-user=_quagga \
Index: distinfo
===
RCS file: /cvs/ports/net/quagga/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo27 Sep 2011 09:45:53 - 1.11
+++ distinfo20 Mar 2012 21:31:55 -
@@ -1,5 +1,5 @@
-MD5 (quagga-0.99.19.tar.gz) = sHOPhrrCSq12p9WTS8q84A==
-RMD160 (quagga-0.99.19.tar.gz) = PIIVi9/MaO3mZdZJ+reWWmpVeXk=
-SHA1 (quagga-0.99.19.tar.gz) = YUkjqiFBWk1twZ1EOMzuY1SOKp0=
-SHA256 (quagga-0.99.19.tar.gz) = vFBS0oWvbnqsQphHQedCYWN8V8SgIDK/Bd56XqOhr+A=
-SIZE (quagga-0.99.19.tar.gz) = 2232051
+MD5 (quagga-0.99.20.1.tar.gz) = Jw3dRkQH+M5vqK2ovBq71w==
+RMD160 (quagga-0.99.20.1.tar.gz) = VtD2vuZVQ+Nxxv8e0UQ4CdsbM1o=
+SHA1 (quagga-0.99.20.1.tar.gz) = MDQVXihbxvts2uztDXmlcP/7NHE=
+SHA256 (quagga-0.99.20.1.tar.gz) = 3oysUecjsUCr7xEmaW3PnGhQBUax2zBDzOQxrp0ykfQ=
+SIZE (quagga-0.99.20.1.tar.gz) = 2251259
Index: patches/patch-bgpd_bgp_open_c
===
RCS file: patches/patch-bgpd_bgp_open_c
diff -N patches/patch-bgpd_bgp_open_c
--- patches/patch-bgpd_bgp_open_c 20 Mar 2012 20:56:26 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-$OpenBSD: patch-bgpd_bgp_open_c,v 1.1 2012/03/20 20:56:26 sthen Exp $
-
-CVE-2012-0255 - Quagga bgpd DoS on malformed OPEN message
-
bgpd/bgp_open.c.orig Mon Sep 26 15:45:54 2011
-+++ bgpd/bgp_open.cTue Mar 20 20:05:06 2012
-@@ -433,13 +433,20 @@ bgp_capability_restart (struct peer *peer, struct capa
- static as_t
- bgp_capability_as4 (struct peer *peer, struct capability_header *hdr)
- {
-+ SET_FLAG (peer->cap, PEER_CAP_AS4_RCV);
-+
-+ if (hdr->length != CAPABILITY_CODE_AS4_LEN)
-+{
-+ zlog_err ("%s AS4 capability has incorrect data length %d",
-+peer->host, hdr->length);
-+ return 0;
-+}
-+
- as_t as4 = stream_getl (BGP_INPUT(peer));
-
- if (BGP_DEBUG (as4, AS4))
- zlog_debug ("%s [AS4] about to set cap PEER_CAP_AS4_RCV, got as4 %u",
- peer->host, as4);
-- SET_FLAG (peer->cap, PEER_CAP_AS4_RCV);
--
- return as4;
- }
-
-@@ -701,9 +708,6 @@ peek_for_as4_capability (struct peer *peer, u_char len
-
- if (hdr.code == CAPABILITY_CODE_AS4)
- {
--if (hdr.length != CAPABILITY_CODE_AS4_LEN)
-- goto end;
--
- if (BGP_DEBUG (as4, AS4))
- zlog_info ("[AS4] found AS4 capability, about to parse");
- as4 = bgp_capability_as4 (peer, &hdr);
Index: patches/patch-bgpd_bgp_packet_c
===
RCS file: patches/patch-bgpd_bgp_packet_c
diff -N patches/patch-bgpd_bgp_packet_c
--- patches/patch-bgpd_bgp_packet_c 20 Mar 2012 20:56:26 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-bgpd_bgp_packet_c,v 1.3 2012/03/20 20:56:26 sthen Exp $
-
-CVE-2012-0255 - Quagga bgpd DoS on malformed OPEN message
-
bgpd/bgp_packet.c.orig Mon Sep 26 15:45:54 2011
-+++ bgpd/bgp_packet.c Tue Mar 20 20:05:06 2012
-@@ -1446,9 +1446,13 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
- /* Open option part parse. */
- if (optlen != 0)
- {
-- ret = bgp_open_option_parse (peer, optlen, &capability);
-- if (ret < 0)
-- return ret;
-+ if ((ret = bgp_open_option_parse (peer, optlen, &capability)) < 0)
-+{
-+ bgp_notify_send (peer,
-+ BGP_NOTIFY_OPEN_ERR,
-+ BGP_NOTIFY_OPEN_UNACEP_HOLDTIM
Re: [UPDATE] taglib-1.7.1
On 2012/03/20 17:00, David Coppa wrote: > On Tue, Mar 20, 2012 at 4:51 PM, Stuart Henderson wrote: > > On 2012/03/20 09:34, David Coppa wrote: > >> > >> Bugfixing update to taglib-1.7.1 > >> > >> If I've checked it right, no version bump needed for shared libs > >> (see attached file)... > > > > Looks like a major bump to me. As well as new functions, some existing > > functions (at least in libtag) which previously had no parameter now > > take a pointer. Maybe they are supposed to be "internal" functions > > but they do make it into the library.. > > This was the reason for me to not bump. > But you're right, I'll do the major bump before committing... > > > Please note that this is a security fix in the commit log, cve IDs are > > in http://www.openwall.com/lists/oss-security/2012/03/05/19 > > Should I do something in particular? > Those two CVEs were already fixed in 1.7p0 via local patches btw. Oh I missed that, I would say something like 'rolling in the fix for SECURITY issues CVE-blah-blah previously in patches'.
Re: [UPDATE] taglib-1.7.1
On Tue, Mar 20, 2012 at 4:51 PM, Stuart Henderson wrote: > On 2012/03/20 09:34, David Coppa wrote: >> >> Bugfixing update to taglib-1.7.1 >> >> If I've checked it right, no version bump needed for shared libs >> (see attached file)... > > Looks like a major bump to me. As well as new functions, some existing > functions (at least in libtag) which previously had no parameter now > take a pointer. Maybe they are supposed to be "internal" functions > but they do make it into the library.. This was the reason for me to not bump. But you're right, I'll do the major bump before committing... > Please note that this is a security fix in the commit log, cve IDs are > in http://www.openwall.com/lists/oss-security/2012/03/05/19 Should I do something in particular? Those two CVEs were already fixed in 1.7p0 via local patches btw. ciao David
Re: [UPDATE] taglib-1.7.1
On 2012/03/20 09:34, David Coppa wrote: > > Bugfixing update to taglib-1.7.1 > > If I've checked it right, no version bump needed for shared libs > (see attached file)... Looks like a major bump to me. As well as new functions, some existing functions (at least in libtag) which previously had no parameter now take a pointer. Maybe they are supposed to be "internal" functions but they do make it into the library.. Please note that this is a security fix in the commit log, cve IDs are in http://www.openwall.com/lists/oss-security/2012/03/05/19 > > Index: Makefile > === > RCS file: /cvs/ports/audio/taglib/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- Makefile 18 Mar 2012 16:15:19 - 1.19 > +++ Makefile 20 Mar 2012 15:27:13 - > @@ -1,12 +1,11 @@ > # $OpenBSD: Makefile,v 1.19 2012/03/18 16:15:19 dcoppa Exp $ > > COMMENT= managing meta-data of audio formats > -DISTNAME=taglib-1.7 > -REVISION=0 > +DISTNAME=taglib-1.7.1 > CATEGORIES= audio devel > > MASTER_SITES=http://developer.kde.org/~wheeler/files/src/ > -SHARED_LIBS += tag 8.1 # .1.7.0 > +SHARED_LIBS += tag 8.1 # .1.7.1 > SHARED_LIBS += tag_c2.0 # .0.0.0 > > HOMEPAGE=http://developer.kde.org/~wheeler/taglib.html > Index: distinfo > === > RCS file: /cvs/ports/audio/taglib/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 14 Oct 2011 09:06:56 - 1.7 > +++ distinfo 20 Mar 2012 15:27:13 - > @@ -1,5 +1,5 @@ > -MD5 (taglib-1.7.tar.gz) = an4xJmjxU/qQWoFxSuvCVw== > -RMD160 (taglib-1.7.tar.gz) = IDCvX2Gx3N6r/IY0fBB9E6MIqAA= > -SHA1 (taglib-1.7.tar.gz) = UTjhZlGCvCFx4pj/MVGMmtct3yM= > -SHA256 (taglib-1.7.tar.gz) = Cd77jb/DWREXmrI3V9dEd0c4Zk34k8D8bY8TmLOrdz8= > -SIZE (taglib-1.7.tar.gz) = 533974 > +MD5 (taglib-1.7.1.tar.gz) = qg9+LZcAu7eMX5kO0vXZtg== > +RMD160 (taglib-1.7.1.tar.gz) = TEq+MU4Sc2ueco463LSjSYCXpb0= > +SHA1 (taglib-1.7.1.tar.gz) = uv4JWOuISYHK3oPUXBjuNBZUebg= > +SHA256 (taglib-1.7.1.tar.gz) = Ut5HCZe2BLeymD97z2BMqNLOAZT74W8s4a/0LlP7h9k= > +SIZE (taglib-1.7.1.tar.gz) = 535319 > Index: patches/patch-taglib_ape_apeproperties_cpp > === > RCS file: /cvs/ports/audio/taglib/patches/patch-taglib_ape_apeproperties_cpp,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-taglib_ape_apeproperties_cpp > --- patches/patch-taglib_ape_apeproperties_cpp18 Mar 2012 16:15:19 > - 1.2 > +++ patches/patch-taglib_ape_apeproperties_cpp20 Mar 2012 15:27:13 > - > @@ -1,10 +1,8 @@ > $OpenBSD: patch-taglib_ape_apeproperties_cpp,v 1.2 2012/03/18 16:15:19 > dcoppa Exp $ > > Fix: crash parsing ID3v2 tag in ape file due to null pointer > -dereference (https://bugs.kde.org/show_bug.cgi?id=278773) > - > -Fix for CVE-2012-1107 > -(upstream git commit 77d61c6eca4d08b9b025738acf6b926cc750db23) > +dereference > +(upstream git commit 7cc36db7606dfc85d2e344d35c4e26fe8f698bdc) > > --- taglib/ape/apeproperties.cpp.origSun Mar 18 16:00:45 2012 > +++ taglib/ape/apeproperties.cpp Sun Mar 18 16:01:58 2012 > @@ -17,12 +15,3 @@ Fix for CVE-2012-1107 > ID3v2OriginalSize = tag.header()->completeTagSize(); > if(tag.header()->tagSize() > 0) > hasID3v2 = true; > -@@ -193,7 +193,7 @@ void APE::Properties::analyzeCurrent() > - uint blocksPerFrame = header.mid(4, 4).toUInt(false); > - uint finalFrameBlocks = header.mid(8, 4).toUInt(false); > - uint totalBlocks = totalFrames > 0 ? (totalFrames - 1) * blocksPerFrame > + finalFrameBlocks : 0; > -- d->length = totalBlocks / d->sampleRate; > -+ d->length = d->sampleRate > 0 ? totalBlocks / d->sampleRate : 0; > - d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 > : 0; > - } > - > Index: patches/patch-taglib_ogg_xiphcomment_cpp > === > RCS file: patches/patch-taglib_ogg_xiphcomment_cpp > diff -N patches/patch-taglib_ogg_xiphcomment_cpp > --- patches/patch-taglib_ogg_xiphcomment_cpp 18 Mar 2012 16:15:19 - > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,16 +0,0 @@ > -$OpenBSD: patch-taglib_ogg_xiphcomment_cpp,v 1.1 2012/03/18 16:15:19 dcoppa > Exp $ > - > -Fix for CVE-2012-1108 > -(upstream git commit ab8a0ee8937256311e649a88e8ddd7c7f870ad59) > - > taglib/ogg/xiphcomment.cpp.orig Fri Mar 11 14:15:38 2011 > -+++ taglib/ogg/xiphcomment.cpp Sun Mar 18 16:01:58 2012 > -@@ -287,7 +287,7 @@ void Ogg::XiphComment::parse(const ByteVector &data) > - > - int pos = 0; > - > -- int vendorLength = data.mid(0, 4).toUInt(false); > -+ uint vendorLength = data.mid(0, 4).toUInt(false); > - pos += 4; > - > - d->vendorID = String(data.mid(pos, vendorLength), String::UTF8); >
[NEW] opencore-amr-0.1.3
I am trying again to get this commited. Is there something I can do to increase the amount of fsck given, or is there actually objections to this? Jan port-opencore-amr-0.1.3.tar.gz Description: application/tar-gz
[UPDATE] taglib-1.7.1
Bugfixing update to taglib-1.7.1
If I've checked it right, no version bump needed for shared libs
(see attached file)...
Index: Makefile
===
RCS file: /cvs/ports/audio/taglib/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile18 Mar 2012 16:15:19 - 1.19
+++ Makefile20 Mar 2012 15:27:13 -
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2012/03/18 16:15:19 dcoppa Exp $
COMMENT= managing meta-data of audio formats
-DISTNAME= taglib-1.7
-REVISION= 0
+DISTNAME= taglib-1.7.1
CATEGORIES=audio devel
MASTER_SITES= http://developer.kde.org/~wheeler/files/src/
-SHARED_LIBS += tag 8.1 # .1.7.0
+SHARED_LIBS += tag 8.1 # .1.7.1
SHARED_LIBS += tag_c2.0 # .0.0.0
HOMEPAGE= http://developer.kde.org/~wheeler/taglib.html
Index: distinfo
===
RCS file: /cvs/ports/audio/taglib/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo14 Oct 2011 09:06:56 - 1.7
+++ distinfo20 Mar 2012 15:27:13 -
@@ -1,5 +1,5 @@
-MD5 (taglib-1.7.tar.gz) = an4xJmjxU/qQWoFxSuvCVw==
-RMD160 (taglib-1.7.tar.gz) = IDCvX2Gx3N6r/IY0fBB9E6MIqAA=
-SHA1 (taglib-1.7.tar.gz) = UTjhZlGCvCFx4pj/MVGMmtct3yM=
-SHA256 (taglib-1.7.tar.gz) = Cd77jb/DWREXmrI3V9dEd0c4Zk34k8D8bY8TmLOrdz8=
-SIZE (taglib-1.7.tar.gz) = 533974
+MD5 (taglib-1.7.1.tar.gz) = qg9+LZcAu7eMX5kO0vXZtg==
+RMD160 (taglib-1.7.1.tar.gz) = TEq+MU4Sc2ueco463LSjSYCXpb0=
+SHA1 (taglib-1.7.1.tar.gz) = uv4JWOuISYHK3oPUXBjuNBZUebg=
+SHA256 (taglib-1.7.1.tar.gz) = Ut5HCZe2BLeymD97z2BMqNLOAZT74W8s4a/0LlP7h9k=
+SIZE (taglib-1.7.1.tar.gz) = 535319
Index: patches/patch-taglib_ape_apeproperties_cpp
===
RCS file: /cvs/ports/audio/taglib/patches/patch-taglib_ape_apeproperties_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-taglib_ape_apeproperties_cpp
--- patches/patch-taglib_ape_apeproperties_cpp 18 Mar 2012 16:15:19 -
1.2
+++ patches/patch-taglib_ape_apeproperties_cpp 20 Mar 2012 15:27:13 -
@@ -1,10 +1,8 @@
$OpenBSD: patch-taglib_ape_apeproperties_cpp,v 1.2 2012/03/18 16:15:19 dcoppa
Exp $
Fix: crash parsing ID3v2 tag in ape file due to null pointer
-dereference (https://bugs.kde.org/show_bug.cgi?id=278773)
-
-Fix for CVE-2012-1107
-(upstream git commit 77d61c6eca4d08b9b025738acf6b926cc750db23)
+dereference
+(upstream git commit 7cc36db7606dfc85d2e344d35c4e26fe8f698bdc)
--- taglib/ape/apeproperties.cpp.orig Sun Mar 18 16:00:45 2012
+++ taglib/ape/apeproperties.cpp Sun Mar 18 16:01:58 2012
@@ -17,12 +15,3 @@ Fix for CVE-2012-1107
ID3v2OriginalSize = tag.header()->completeTagSize();
if(tag.header()->tagSize() > 0)
hasID3v2 = true;
-@@ -193,7 +193,7 @@ void APE::Properties::analyzeCurrent()
- uint blocksPerFrame = header.mid(4, 4).toUInt(false);
- uint finalFrameBlocks = header.mid(8, 4).toUInt(false);
- uint totalBlocks = totalFrames > 0 ? (totalFrames - 1) * blocksPerFrame +
finalFrameBlocks : 0;
-- d->length = totalBlocks / d->sampleRate;
-+ d->length = d->sampleRate > 0 ? totalBlocks / d->sampleRate : 0;
- d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 :
0;
- }
-
Index: patches/patch-taglib_ogg_xiphcomment_cpp
===
RCS file: patches/patch-taglib_ogg_xiphcomment_cpp
diff -N patches/patch-taglib_ogg_xiphcomment_cpp
--- patches/patch-taglib_ogg_xiphcomment_cpp18 Mar 2012 16:15:19 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-taglib_ogg_xiphcomment_cpp,v 1.1 2012/03/18 16:15:19 dcoppa
Exp $
-
-Fix for CVE-2012-1108
-(upstream git commit ab8a0ee8937256311e649a88e8ddd7c7f870ad59)
-
taglib/ogg/xiphcomment.cpp.origFri Mar 11 14:15:38 2011
-+++ taglib/ogg/xiphcomment.cpp Sun Mar 18 16:01:58 2012
-@@ -287,7 +287,7 @@ void Ogg::XiphComment::parse(const ByteVector &data)
-
- int pos = 0;
-
-- int vendorLength = data.mid(0, 4).toUInt(false);
-+ uint vendorLength = data.mid(0, 4).toUInt(false);
- pos += 4;
-
- d->vendorID = String(data.mid(pos, vendorLength), String::UTF8);
diff -Naur taglib-1.7/taglib-1.7/CMakeLists.txt
taglib-1.7.1/taglib-1.7.1/CMakeLists.txt
--- taglib-1.7/taglib-1.7/CMakeLists.txtFri Mar 11 14:15:38 2011
+++ taglib-1.7.1/taglib-1.7.1/CMakeLists.txtSat Mar 17 11:02:24 2012
@@ -40,7 +40,7 @@
SET(TAGLIB_LIB_MAJOR_VERSION "1")
SET(TAGLIB_LIB_MINOR_VERSION "7")
-SET(TAGLIB_LIB_PATCH_VERSION "0")
+SET(TAGLIB_LIB_PATCH_VERSION "1")
SET(TAGLIB_LIB_VERSION_STRING
"${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
@@ -76,6 +76,7 @@
INSTALL( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION
${BIN_INSTALL_DIR})
-CONFIGURE_FILE(${CMAKE_CUR
Re: [UPDATE] sox-14.4.0
Let me try again:
below is a better diff to 14.3.2
> > -MODULES= converters/libiconv
> This is definitely wrong. Keep the libiconv module and delete iconv
> from WANTLIB.
Fixed below.
> You probably shouldn't do spurious whitespace changes here, it makes the
> diff hard to read. Also, delete libiconv here (see above). You should
> also keep the order so we can see exactly which dependencies you're
> adding/removing.
The only point here was to reaarange the./configure options
to the order in which they appear in actual ./configure, to
make it more readable on the next update; I will psotpone that
to a separate diff.
> Likewise here. Also, you're adding --with-sndfile, but I see neither
> LIB_DEPENDS nor WANTLIB for libsndfile.
Also fixed below.
Thank you for looking.
Any further comments? OK?
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- Makefile15 Jun 2011 08:29:34 - 1.49
+++ Makefile20 Mar 2012 15:26:40 -
@@ -2,7 +2,7 @@
COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
-DISTNAME= sox-14.3.2
+DISTNAME= sox-14.4.0
SHARED_LIBS += sox 2.0 # .1.0
CATEGORIES=audio
@@ -20,6 +20,7 @@ MODULES= converters/libiconv
WANTLIB += c m ogg sndio z
WANTLIB += vorbis vorbisenc vorbisfile FLAC magic
WANTLIB += mad id3tag mp3lame wavpack png gsm
+WANTLIB += sndfile
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/}
@@ -29,6 +30,7 @@ LIB_DEPENDS= audio/libvorbis \
devel/libmagic \
audio/libmad \
audio/libid3tag \
+ audio/libsndfile \
audio/lame \
audio/wavpack \
graphics/png \
@@ -38,6 +40,7 @@ USE_GROFF=Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
+ --datarootdir=${LOCALBASE} \
--disable-silent-libtool
# Don't use modules
@@ -46,11 +49,15 @@ CONFIGURE_ARGS+=--without-libltdl
# Sound drivers
CONFIGURE_ARGS+=--without-ao \
--without-oss \
+ --without-alsa \
+ --without-coreaudio \
+ --without-pulseaudio\
+ --without-waveaudio \
--with-sndio \
--without-sunaudio
# Additional file formats
-CONFIGURE_ARGS+=--without-sndfile \
+CONFIGURE_ARGS+=--with-sndfile \
--with-oggvorbis \
--with-flac \
--without-ffmpeg \
@@ -58,10 +65,12 @@ CONFIGURE_ARGS+=--without-sndfile \
--with-mad \
--with-id3tag \
--with-lame \
+ --with-twolame \
--without-amrwb \
--without-amrnb \
--with-wavpack \
--with-png \
+ --with-gsm \
--without-ladspa
CONFIGURE_ENV= \
Index: distinfo
===
RCS file: /cvs/ports/audio/sox/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo15 Jun 2011 08:29:34 - 1.11
+++ distinfo20 Mar 2012 15:26:40 -
@@ -1,5 +1,5 @@
-MD5 (sox-14.3.2.tar.gz) = 6dNc87D4h4WW4LfEn56DAg==
-RMD160 (sox-14.3.2.tar.gz) = W46GvWSt4tlTSZMxdHTDO0EJAYM=
-SHA1 (sox-14.3.2.tar.gz) = rUYhFP9HsJQHjxgUi8ninjG0K5I=
-SHA256 (sox-14.3.2.tar.gz) = BmjMCHw0b3xAhK4pTGdqEd3vtGKXS8P2e+MNeJyFDo8=
-SIZE (sox-14.3.2.tar.gz) = 1110175
+MD5 (sox-14.4.0.tar.gz) = sMFc/3pLoOwX/cdOah+c8Q==
+RMD160 (sox-14.4.0.tar.gz) = rxtsAtKcmI+bDf7Jyp67MJSbBmM=
+SHA1 (sox-14.4.0.tar.gz) = 2AnKs4LHqdAVSRxpBRqdHBoaRPE=
+SHA256 (sox-14.4.0.tar.gz) = PuNLFN0mfeN46KEXqugexMrjMHcjQualW79lIKCoiqM=
+SIZE (sox-14.4.0.tar.gz) = 1105756
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/sox/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 8 Jan 2009 19:48:21 - 1.6
+++ pkg/PLIST 20 Mar 2012 15:26:40 -
@@ -8,7 +8,6 @@ bin/rec
@bin bin/sox
bin/soxi
include/sox.h
-include/soxstdint.h
lib/libsox.a
lib/libsox.la
lib/pkgconfig/
Re: Racket port for testing
Lars Engblom writes:
> Did you have to crank up any sysctl values?
No. Only the obvious "machdep.allowaperture=2" is set.
> As it did not segfault for you, it might be that my computer running
> i386 is broken. It is an old laptop that has been into the floor and
> having the screen broken.
>
> I have been testing it now on a couple of amd64 computers and it has
> been working on each one.
It is ~3 years old Dell Optiplex 960 (could run amd64 but i'm still
using i386 on it) so not really an old i386. Anyway, here's the full
dmesg:
OpenBSD 5.1-current (GENERIC.MP) #202: Thu Mar 15 18:33:09 MDT 2012
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
RTC BIOS diagnostic error 11
cpu0: Intel(R) Core(TM)2 Duo CPU E8600 @ 3.33GHz ("GenuineIntel" 686-class)
3.33 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,NXE,LONG,SSE3,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,LAHF
real mem = 3487096832 (3325MB)
avail mem = 3419299840 (3260MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 07/31/09, BIOS32 rev. 0 @ 0xffea0, SMBIOS
rev. 2.5 @ 0xf0450 (82 entries)
bios0: vendor Dell Inc. version "A05" date 07/31/2009
bios0: Dell Inc. OptiPlex 960
acpi0 at bios0: rev 2
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP SSDT APIC BOOT ASF! MCFG HPET SLIC SSDT SSDT SSDT
acpi0: wakeup devices VBTN(S4) PCI0(S5) PCI4(S5) PCI2(S5) PCI3(S5) PCI1(S5)
PCI5(S5) PCI6(S5) MOU_(S3) USB0(S3) USB1(S3) USB2(S3) USB3(S3) USB4(S3) USB5(S3)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: apic clock running at 332MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM)2 Duo CPU E8600 @ 3.33GHz ("GenuineIntel" 686-class)
3.33 GHz
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,NXE,LONG,SSE3,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,LAHF
ioapic0 at mainbus0: apid 8 pa 0xfec0, version 20, 24 pins
ioapic0: misconfigured as apic 0, remapped to apid 8
acpimcfg0 at acpi0 addr 0xe000, bus 0-255
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 4 (PCI4)
acpiprt1 at acpi0: bus 2 (PCI2)
acpiprt2 at acpi0: bus 3 (PCI3)
acpiprt3 at acpi0: bus 1 (PCI1)
acpiprt4 at acpi0: bus -1 (PCI5)
acpiprt5 at acpi0: bus -1 (PCI6)
acpiprt6 at acpi0: bus 0 (PCI0)
acpicpu0 at acpi0: C1, PSS
acpicpu1 at acpi0: C1, PSS
acpibtn0 at acpi0: VBTN
bios0: ROM list: 0xc/0x1 0xd/0x2000! 0xd2000/0x2000
cpu0: Enhanced SpeedStep 3326 MHz: speeds: , 3000, 2667, 2333, 2000 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 "Intel Q45 Host" rev 0x03
ppb0 at pci0 dev 1 function 0 "Intel Q45 PCIE" rev 0x03: apic 8 int 16
pci1 at ppb0 bus 1
vga1 at pci1 dev 0 function 0 "ATI Radeon HD 3470" rev 0x00
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
radeondrm0 at vga1: apic 8 int 16
drm0 at radeondrm0
"Intel Q45 HECI" rev 0x03 at pci0 dev 3 function 0 not configured
pciide0 at pci0 dev 3 function 2 "Intel Q45 PT IDER" rev 0x03: DMA
(unsupported), channel 0 wired to native-PCI, channel 1 wired to native-PCI
pciide0: using apic 8 int 18 for native-PCI interrupt
pciide0: channel 0 ignored (not responding; disabled or no drives?)
pciide0: channel 1 ignored (not responding; disabled or no drives?)
"Intel Q45 KT" rev 0x03 at pci0 dev 3 function 3 not configured
em0 at pci0 dev 25 function 0 "Intel ICH10 D BM LM" rev 0x02: msi, address
00:24:e8:47:9f:46
uhci0 at pci0 dev 26 function 0 "Intel 82801JD USB" rev 0x02: apic 8 int 16
uhci1 at pci0 dev 26 function 1 "Intel 82801JD USB" rev 0x02: apic 8 int 17
uhci2 at pci0 dev 26 function 2 "Intel 82801JD USB" rev 0x02: apic 8 int 22
ehci0 at pci0 dev 26 function 7 "Intel 82801JD USB" rev 0x02: apic 8 int 22
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
azalia0 at pci0 dev 27 function 0 "Intel 82801JD HD Audio" rev 0x02: msi
azalia0: codecs: Analog Devices AD1984A
audio0 at azalia0
ppb1 at pci0 dev 28 function 0 "Intel 82801JD PCIE" rev 0x02: apic 8 int 16
pci2 at ppb1 bus 2
ppb2 at pci0 dev 28 function 1 "Intel 82801JD PCIE" rev 0x02: apic 8 int 17
pci3 at ppb2 bus 3
uhci3 at pci0 dev 29 function 0 "Intel 82801JD USB" rev 0x02: apic 8 int 23
uhci4 at pci0 dev 29 function 1 "Intel 82801JD USB" rev 0x02: apic 8 int 17
uhci5 at pci0 dev 29 function 2 "Intel 82801JD USB" rev 0x02: apic 8 int 18
ehci1 at pci0 dev 29 function 7 "Intel 82801JD USB" rev 0x02: apic 8 int 23
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 "Intel EHCI root hub" rev 2.00/1.00 addr 1
ppb3 at pci0 dev 30 function 0 "Intel 82801BA Hub-to-PCI" rev 0xa2
pci4 at ppb3 bus 4
pcib0 at pci0 dev 31 function 0 "Intel 82801JDO LPC" rev 0x02
pciide1 at pci0 dev 31 function 2 "I
small diff to netbsd-iscsi-target
This diff changes the VPD page with the serial numbers so that OpenBSD and
Solaris are able to use the netbsd-iscsi-target via multipath.
With this in I'm able to add the iscsi-target to sym(4) and so the
disk is not lost when iscsid is restarted.
According to dlg@ the NetBSD code is wrong and that's why this diff came
up.
--
:wq Claudio
Index: Makefile
===
RCS file: /cvs/ports/net/netbsd-iscsi-target/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile21 Feb 2012 22:41:30 - 1.3
+++ Makefile20 Mar 2012 07:11:19 -
@@ -4,6 +4,7 @@ COMMENT=iSCSI (RFC 3720) target from Ne
DISTNAME= netbsd-iscsi-20111006
PKGNAME= ${DISTNAME:S/-iscsi/-iscsi-target/}
+REVISION= 1
CATEGORIES=net sysutils
Index: patches/patch-src_lib_disk_c
===
RCS file: patches/patch-src_lib_disk_c
diff -N patches/patch-src_lib_disk_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_lib_disk_c20 Mar 2012 07:04:06 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/lib/disk.c.origTue Mar 16 15:27:17 2010
src/lib/disk.c Tue Mar 20 08:03:58 2012
+@@ -1057,7 +1057,7 @@ device_vpd(iscsi_target_t *tgt, uint8_t *data, uint8_t
+ cp[0] = (INQUIRY_DEVICE_ISCSI_PROTOCOL << 4) |
+ INQUIRY_DEVICE_CODESET_UTF8;
+ cp[1] = (INQUIRY_DEVICE_PIV << 7) |
+- (INQUIRY_DEVICE_ASSOCIATION_TARGET_DEVICE << 4) |
++ (INQUIRY_DEVICE_ASSOCIATION_LOGICAL_UNIT << 4) |
+ INQUIRY_IDENTIFIER_TYPE_T10;
+ strpadcpy(&cp[4], 8, ISCSI_VENDOR, strlen(ISCSI_VENDOR), ' ');
+ len = 8;
UPDATE: games/xmoto
Update to xmoto's newest release.
Switch MAINTAINER, requested by previous maintainer.
--
Antti Harri
diff --git games/xmoto/Makefile games/xmoto/Makefile
index a50e31a..e81c065 100644
--- games/xmoto/Makefile
+++ games/xmoto/Makefile
@@ -2,13 +2,12 @@
COMMENT = challenging 2D motocross platform game
-V =0.5.2
+V =0.5.9
DISTNAME = xmoto-${V}-src
PKGNAME = xmoto-${V}
-REVISION= 0
CATEGORIES = games
-MAINTAINER = Jonathan Armani
+MAINTAINER = Antti Harri
HOMEPAGE = http://xmoto.tuxfamily.org/
MASTER_SITES = http://download.tuxfamily.org/xmoto/xmoto/${V}/
@@ -19,32 +18,44 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += GL GLU SDL X11 c m pthread pthread-stubs stdc++ xcb z
-WANTLIB += SDL_mixer SDL_net SDL_ttf bz2 curl jpeg ode lua png sqlite3
+WANTLIB += GL GLU SDL SDL_mixer SDL_net SDL_ttf X11 bz2 c curl jpeg
+WANTLIB += lua m ode png pthread sqlite3 stdc++ xdg-basedir xml2 z
MODULES= devel/gettext
-
-LIB_DEPENDS = devel/sdl-mixer \
+BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+LIB_DEPENDS = archivers/bzip2 \
+ databases/sqlite3 \
+ devel/ode \
+ devel/sdl-mixer \
devel/sdl-net \
devel/sdl-ttf \
- archivers/bzip2 \
- net/curl \
graphics/jpeg \
- devel/ode \
- lang/lua \
graphics/png \
- databases/sqlite3
+ lang/lua \
+ net/curl \
+ textproc/libxml \
+ x11/libxdg-basedir
-USE_GMAKE =Yes
+SEPARATE_BUILD = Yes
USE_GROFF =Yes
+
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include
-I${X11BASE}/include \
- -I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- LIBS="-lGL -lm -pthread"
+CONFIGURE_ENV =CPPFLAGS="`pkg-config --cflags libpng sqlite3
sdl` -DSVN_REV='\"${V}\"'" \
+ LDFLAGS="`pkg-config --libs libpng sdl` -lGL"
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
+
+NO_REGRESS = Yes
WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
+pre-configure:
+ cd ${WRKSRC} && \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ autoreconf -fi
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmoto/
${INSTALL_DATA} ${WRKSRC}/{COPYING,README} ${PREFIX}/share/doc/xmoto/
diff --git games/xmoto/distinfo games/xmoto/distinfo
index 869d5ea..0043f9f 100644
--- games/xmoto/distinfo
+++ games/xmoto/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmoto-0.5.2-src.tar.gz) = HjZ4687KIdYYRO+1PBQCJw==
-RMD160 (xmoto-0.5.2-src.tar.gz) = qDIzNoFCYbDCuwrPE9XmWskukh0=
-SHA1 (xmoto-0.5.2-src.tar.gz) = qoGYcvBr6xFAJcSQzqjiKc2FE10=
-SHA256 (xmoto-0.5.2-src.tar.gz) = qMkTeO1Dm2QBVyZ5gbQj3O6jWEpDnSXuqKooGBRYBY8=
-SIZE (xmoto-0.5.2-src.tar.gz) = 38170502
+MD5 (xmoto-0.5.9-src.tar.gz) = 2Na3pAUTlTBlC4qa4upt8w==
+RMD160 (xmoto-0.5.9-src.tar.gz) = NP29PnsmxnjrTA5aR3tF3gIWd4Y=
+SHA1 (xmoto-0.5.9-src.tar.gz) = B3V6zM54FR3IhzvvgnDfDlYZZ3I=
+SHA256 (xmoto-0.5.9-src.tar.gz) = dNdXRHatMhxD22wN9tN4lUBo4lFOP0rK4cwyLfigM+Q=
+SIZE (xmoto-0.5.9-src.tar.gz) = 40385328
diff --git games/xmoto/patches/patch-bin_Makefile_am
games/xmoto/patches/patch-bin_Makefile_am
new file mode 100644
index 000..841b507
--- /dev/null
+++ games/xmoto/patches/patch-bin_Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bin/Makefile.am.orig Tue Oct 11 23:19:23 2011
bin/Makefile.amSat Mar 10 13:06:51 2012
+@@ -14,7 +14,7 @@ else
+ if WIN32
+ echo "Windows, cannot build xmoto.bin in the src directory ; build it
from the exec directory."
+ else
+- if test -e $<; then ../src/xmoto --pack $@ `dirname $<`; fi
++ if test -e $@; then ../src/xmoto --pack $@ `dirname $@`; fi
+ endif
+ endif
+
diff --git games/xmoto/patches/patch-configure_in
games/xmoto/patches/patch-configure_in
new file mode 100644
index 000..f658e35
--- /dev/null
+++ games/xmoto/patches/patch-configure_in
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Sun Nov 13 22:04:13 2011
configure.in Sat Mar 10 12:53:53 2012
+@@ -32,7 +32,7 @@ AM_PATH_XML2([],
+ [AC_MSG_ERROR([*** cannot find the libxml2 library ])])
+ CPPFLAGS="$CPPFLAGS"" ""$XML_CPPFLAGS"
+ CFLAGS="$CFLAGS"" ""$XML_CPPFLAGS"
+-LIBS="$LIBS""$XML_LIBS"
++LIBS="$LIBS"" ""$XML_LIBS"
+ fi
+
+ dnl bz2
diff --git games/xmoto/patches/patch-m4_gettext_m4
games/xmoto/patches/patch-m4_gettext_m4
new file mode 100644
index 000..6b3032e
--- /dev/null
+++ games/xmoto/patches/patch-m4_gettext_m4
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/gettext.m4.orig Sat Mar 10 14:06:51
Re: UPDATE games/wesnoth
On Monday 19 March 2012 22:25:50 Kirill Bychkov wrote: > Hi! > I've updated wesnoth to the latest release 1.10.1. > General difference (for ports infrastructure): > * upstream switched to cmake build system > * they dropped external lua a long time ago and use their own patched > variant ( http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=44911 ) > Full changelog: > http://svn.gna.org/viewcvs/*checkout*/wesnoth/tags/1.10.0/changelog (a lot > of changes since 1.8.6) > > I set up SEPARATE_BUILD=flavored to avoid extracting a lot of data for > every arch. Also removed superfluous dependency to devel/sdl. tinygui > flavor was dropped by upstream about a year ago. > > Tested on amd64 playing new campaign all night long. (And it must be > confessed that I was playing all last week) > > Already OK from aja@ > > Maintainer (jasper@) timed out. > > OK? Works on amd64. -- Antti Harri
Re: NEW: japanese/mecab
On 2012/03/16 23:43, Federico Schwindt wrote:
> Hi,
>
> Attached is a port of MeCab, a Japanese morphological analyzer engine
> and the IPA dictionary for MeCab.
> This is needed for the Japanese plugin for anki and the upcoming gwaei
> update that supports deinflection of verbs and adjectives.
> Comments? OK?
>
> f.-
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> ${PKGNAME-ipadic}-${IPADIC_VER}.tar.gz
I wasn't sure about this at first, but it is alright now that we
have REVISION/EPOCH and the suffixes (p0 etc) don't affect PKGNAME.
OK.
Re: Racket port for testing
Did you have to crank up any sysctl values? As it did not segfault for you, it might be that my computer running i386 is broken. It is an old laptop that has been into the floor and having the screen broken. I have been testing it now on a couple of amd64 computers and it has been working on each one. On 03/20/12 12:21, Manuel Giraud wrote: Lars Engblom writes: Hello, Here comes a port of Racket for testing. I have been testing it on a clean install of -current on amd64 and it is working. I have not got it to build on i386 (I get segfault). The question is, is it possible to crank up some sysctl values for i386 build to succeed or will this be an amd64-only port? This is why i have those comments still left in the Makefile. I was able to compile on this: OpenBSD 5.1-current (GENERIC.MP) #202: Thu Mar 15 18:33:09 MDT 2012 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP I have run drracket and test some examples (including a "web server" and graphical one) from their website. Thanks for this port.
Re: python library linkage with ctypes
On Tue, Mar 20, 2012 at 10:33:46AM +0100, Jonathan Armani wrote:
> I think you want RTLD_GLOBAL flag, by default RTDL_LOCAL is used.
>
> >>> ctypes.CDLL("libGL.so", ctypes.RTLD_GLOBAL)
>
> >>> ctypes.CDLL("libGLU.so", ctypes.RTLD_GLOBAL)
>
That appears to be the ticket. Cheers
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE games/wesnoth
On Mon, Mar 19, 2012 at 9:25 PM, Kirill Bychkov wrote: > Hi! > I've updated wesnoth to the latest release 1.10.1. > General difference (for ports infrastructure): > * upstream switched to cmake build system > * they dropped external lua a long time ago and use their own patched variant > ( http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=44911 ) > Full changelog: > http://svn.gna.org/viewcvs/*checkout*/wesnoth/tags/1.10.0/changelog (a lot of > changes since 1.8.6) > > I set up SEPARATE_BUILD=flavored to avoid extracting a lot of data for every > arch. Also removed superfluous dependency to devel/sdl. tinygui flavor was > dropped by upstream about a year ago. > > Tested on amd64 playing new campaign all night long. (And it must be confessed > that I was playing all last week) > > Already OK from aja@ > > Maintainer (jasper@) timed out. > > OK? cmake-wise ok for me ciao, David
Re: Racket port for testing
Lars Engblom writes: > Hello, > > Here comes a port of Racket for testing. > > I have been testing it on a clean install of -current on amd64 and it > is working. > > I have not got it to build on i386 (I get segfault). The question is, > is it possible to crank up some sysctl values for i386 build to > succeed or will this be an amd64-only port? This is why i have those > comments still left in the Makefile. I was able to compile on this: OpenBSD 5.1-current (GENERIC.MP) #202: Thu Mar 15 18:33:09 MDT 2012 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP I have run drracket and test some examples (including a "web server" and graphical one) from their website. Thanks for this port. -- Manuel Giraud
Re: python library linkage with ctypes
On Tue, Mar 20, 2012 at 09:02:13AM +, Edd Barrett wrote:
> Hi,
>
> Having spoken to sthen and djm, I am still stuck on this, so I am posting on
> ports, incase someone here knows.
>
> Im looking at porting something which uses ctypes to load first libGL and then
> libGLU. Once we strip the gunk away, the library loading looks like this:
>
> ---8<---
> import ctypes
> ctypes.cdll.LoadLibrary("libGL.so")
> ctypes.cdll.LoadLibrary("libGLU.so")
> ---8<---
>
> Try it on a python shell. The final line spews errors about missing
> symbols:
>
> ---8<---
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPixelStorei'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glEvalPoint2'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glMultMatrixd'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPopAttrib'
> ...
> ---8<---
>
> These symbols are from libGL.so (i used nm to check this), which we supposedly
> loaded on the previous line.
>
> I have used LD_DEBUG to check libGL is correctly loaded, and it is, log
> here:
> http://theunixzoo.co.uk/files/pylog
>
> I can even see the functions from the python interpreter:
> >>> libgl = ctypes.cdll.LoadLibrary("libGL.so")
> >>> libgl
>
> >>> libgl.glEnd
> <_FuncPtr object at 0x7c07402c>
>
> If you use LD_PRELOAD, all is well:
>
> ---8<---
> % LD_PRELOAD=/usr/X11R6/lib/libGLU.so.7.0 python2.7
> Python 2.7.2 (default, Mar 16 2012, 06:30:10)
> [GCC 4.2.1 20070719 ] on openbsd5
> Type "help", "copyright", "credits" or "license" for more information.
> >>> import ctypes
> >>> ctypes.cdll.LoadLibrary("libGLU.so")
>
> ---8<---
>
> So, why the undefined symbol errors? Any ideas?
>
> --
> Best Regards
> Edd Barrett
>
> http://www.theunixzoo.co.uk
>
Hi,
I think you want RTLD_GLOBAL flag, by default RTDL_LOCAL is used.
>>> ctypes.CDLL("libGL.so", ctypes.RTLD_GLOBAL)
>>> ctypes.CDLL("libGLU.so", ctypes.RTLD_GLOBAL)
Re: python library linkage with ctypes
On Tue, Mar 20, 2012 at 09:02:13AM +, Edd Barrett wrote:
> Hi,
>
> Having spoken to sthen and djm, I am still stuck on this, so I am posting on
> ports, incase someone here knows.
>
> Im looking at porting something which uses ctypes to load first libGL and then
> libGLU. Once we strip the gunk away, the library loading looks like this:
>
> ---8<---
> import ctypes
> ctypes.cdll.LoadLibrary("libGL.so")
> ctypes.cdll.LoadLibrary("libGLU.so")
> ---8<---
>
> Try it on a python shell. The final line spews errors about missing
> symbols:
>
> ---8<---
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPixelStorei'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glEvalPoint2'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glMultMatrixd'
> python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPopAttrib'
> ...
RTFM, dlopen(3), RTLD_GLOBAL vs. RTLD_LOCAL.
python library linkage with ctypes
Hi,
Having spoken to sthen and djm, I am still stuck on this, so I am posting on
ports, incase someone here knows.
Im looking at porting something which uses ctypes to load first libGL and then
libGLU. Once we strip the gunk away, the library loading looks like this:
---8<---
import ctypes
ctypes.cdll.LoadLibrary("libGL.so")
ctypes.cdll.LoadLibrary("libGLU.so")
---8<---
Try it on a python shell. The final line spews errors about missing
symbols:
---8<---
python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPixelStorei'
python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glEvalPoint2'
python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glMultMatrixd'
python2.7:/usr/X11R6/lib/libGLU.so.7.0: undefined symbol 'glPopAttrib'
...
---8<---
These symbols are from libGL.so (i used nm to check this), which we supposedly
loaded on the previous line.
I have used LD_DEBUG to check libGL is correctly loaded, and it is, log
here:
http://theunixzoo.co.uk/files/pylog
I can even see the functions from the python interpreter:
>>> libgl = ctypes.cdll.LoadLibrary("libGL.so")
>>> libgl
>>> libgl.glEnd
<_FuncPtr object at 0x7c07402c>
If you use LD_PRELOAD, all is well:
---8<---
% LD_PRELOAD=/usr/X11R6/lib/libGLU.so.7.0 python2.7
Python 2.7.2 (default, Mar 16 2012, 06:30:10)
[GCC 4.2.1 20070719 ] on openbsd5
Type "help", "copyright", "credits" or "license" for more information.
>>> import ctypes
>>> ctypes.cdll.LoadLibrary("libGLU.so")
---8<---
So, why the undefined symbol errors? Any ideas?
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Prospectez efficacement avec Sage 100 CRM i7
Développez votre CA avec une solution CRM simple, rapide et efficace. Visualiser la version en ligne de ce message http://p5trc.emv2.com/HM?a=ENX7Cqkhky9q8SA9MKJMHQLnGHxKLPgAfvcStGb5lw8W0bBhOG5mpqVsje_HhdAPelKh Sage i7 http://p5trc.emv2.com/HS?a=ENX7Cqkhky9q8SA9MKJMHQLnGHxKLPgAffcStGb5lw8W0bBhOG5mpqVsje_HhdAPelKk Sage 100 CRM i7 Développez votre CA avec une solution CRM simple, rapide et efficace Développez votre chiffre d'affaires et votre efficacité commerciale Transformez votre service en centre de profits Augmentez vos revenus grâce à des actions marketing maitrisées En savoir plus http://p5trc.emv2.com/HS?a=ENX7Cqkhky9q8SA9MKJMHQLnGHxKLPgAffcStGb5lw8W0bBhOG5mpqVsje_HhdAPelKk Sage - SaS - Siège social : Le Colisée 2, 10 rue Fructidor - Paris 17 ème 313 966 129 RCS Paris - Sage est locataire-gérant de Ciel et Sage FDC. Dans ce contexte, il est indispensable de fournir à aux services opérationnels de votre entreprise, commerciaux, service , département marketing, le meilleur outil pour développer votre productivité piloter votre activité dans un environnement marqué par un manque de visibilité. Pour vos commerciaux, une plus grande efficacité implique : Un accès immédiat aux informations clés sur les contacts (emails, appels?). Une vision à 360 degré des , d'un point de vue commercial, technique ou comptable. Une analyse en temps réel du portefeuille d'affaires et de l'atteinte des objectifs. Une automatisation des tâches administratives (rappels, rapports?) pour se concentrer sur la vente. Pour votre Service la productivité doit être liée à l'augmentation de la qualité de service : Une meilleure réactivité avec la gestion des contrats de services et des tickets. Un service personnalisé avec la traçabilité des échanges. Une plus grande fiabilité des réponses avec une Base de Connaissances Partagée. Une continuité de service avec un Portail ouvert 24h / 24 et 7 jours sur 7. Pour le Département Marketing, l'enjeu essentiel est d'optimiser le Budget Marketing : Définition d'un plan marketing annuel avec le cadencement des campagnes à mener. Exploitation optimale de votre base : profiling, détection des cibles inexploitées, des inactifs... Optimisation des canaux de communication pour mettre en adéquation chaîne de fidélisation et retour sur investissement. Analyse des performances des actions marketing pour arbitrer ses dépenses. Enfin, avec une Solution de Gestion de la Relation , la Direction Générale bénéficie d'un outil optimal pour piloter à court et moyen terme l'activité, prévoir le potentiel de ventes et adapter la voilure budgétaire de l'entreprise. Vous souhaitez améliorer la productivité de vos services opérationnels et disposer d'un outil pour piloter votre entreprise ? Sage CRM est fait pour vous ! Pour gérer la réception de nos emails, en ligne. http://p5trc.emv2.com/HP?a=ENX7Cqkhky9q8SA9MKJMHQLnGHxKLPgADvcStGb5lw8W0bBhOG5mpqVsje_HhdAPelKx
Re: getdelim/getline fallout
On Mon, Mar 19, 2012 at 1:49 PM, Antti Harri wrote: > Attached a new tarball of sysutils/coreutils and the rest follows as > a diff. Looks good to me. ok ciao David
2 Gece 3 Gün Herşey Dahil Konaklama Hem İndirimli Hem Taksitle
20 MART 2012 Antalya Otelleri Tatil Fırsatları ERKEN REZERVASYON TERMAL OTELLER YURTİÇİ OTELLER KIBRIS GEMİ TURLARI TATİL FIRSATLARI CRYTAL BODRUM HOTEL ' DE KAÇIRILMAYACAK TATİL FIRSATI Bodrum Crystal Hotelde 2 gece 3 gün herşey dahil konaklama,odaya girişte meyve sepeti,2 kişilik öğle yemekli günübirlik yat turu oluşan çift kişilik tatil paketi 380 TL yerine 229 TL ve 3 Taksit ! Detaylar için tıklayınız. Bütün fırsatlarımızı görmek için tıklayınız !.. [IMAGE] SAFRANBOLU ÇAMLICA KONAĞI SAFRANBOLU/KARABÜK Safranbolu Çamlıca Konağında Tek Gece Konaklama, Sabah Kahvaltısı ve Akşam Yemeği Dahil Kişibaşı 85 TL Yerine 42,5 TL ve 2 Taksit Avantajı İle (31 Mayıs'a Kadar Geçerlidir.) Kişi Başı Gecelik 85 TL 42 TL %50¡ Paylaş: [IMAGE] [IMAGE] BC SPA HOTEL DALYAN/MUĞLA Dalyan BC Spa Hotel'de Standart Oda'da Tek Gece Konaklama Kişibaşı 64,5 TL Yerine 44,5 TL ve 2 Taksit Avantajı İle. Kişi Başı Gecelik 63 TL 44 TL %30¡ Paylaş: [IMAGE] [IMAGE] MONTEBELLO BEACH HOTEL ÖLÜDENİZ/FETHİYE Ölüdenizin yanı başında Fethiye Montebello Hotel, 2 kişi 2 gece standart odada konaklama, açık büfe sabah kahvaltısı ve akşam yemeği dahil 338 TL yerine 169 TL! 15 Hazirana kadar geçerli! Kişi Başı Gecelik 338 TL 169 TL %50¡ Paylaş: [IMAGE] [IMAGE] BEYRUT TURU 3 GECE 4 GÜN 23 NİSAN ÖZEL BEYRUT TURU, 20 - 23 Nisan 2012 Tarihlerinde Middle East Havayolları ile 3 gece / 4 gün Oda Kahvaltı Konaklama,Tüm Transferler,Şehir Turu,Vergiler Dahil Kişibaşı 999 TL. 3 TAKSİT Avantajıyla Kişi Başı Gecelik 1427 TL 999 TL %30¡ Paylaş: [IMAGE] [IMAGE] DUBAİ TURU 3 GECE 4 GÜN 23 NİSAN ÖZEL DUBAİ TURU, 21 - 24 Nisan 2012 Tarihlerinde Air Arabia Havayolları ile 3 gece/4 gün O.Kahvaltı Konaklama,Şehir Turu,Vergiler Dahil Kişibaşı 999 TL. ve 3 TAKSİT Avantajıyla Kişi Başı Gecelik 1427 TL 999 TL %30¡ Paylaş: [IMAGE] [IMAGE] LEGEND HOTEL ISTANBUL Legend Hotel İstanbul'da Açık Büfe Sabah Kahvaltısı-Akşam Yemeği Dahil, Yarım Pansiyon Konaklama, Kapalı Yüzme Havuzu, Jakuzi, Sauna, Fitness Center gibi günboyu süren Aktiviteler Dahil Kişi Başı 99 TL !.. Kişi Başı Gecelik 200 TL 99 TL %50¡ Paylaş: [IMAGE] [IMAGE] KAŞ THETIS HOTEL KAŞ/ANTALYA Kaş Thetis Otel'de 2 gece 3 gün oda-kahvaltı konaklama,meyve sepeti ikramından oluşan çift kişilik tatil paketi 280 TL yerine 169 TL ve 2 Taksit Kişi Başı Gecelik 280 TL 169 TL %40¡ Paylaş: [IMAGE] [IMAGE] KİLYOS KALE İSTANBUL KİLYOS/İSTANBUL Kilyos Kale Hotel ' de Tek Gece Konaklama, Açık Büfe Sabah Kahvaltısı ve Akşam Yemeği Dahil Kişi Başı 100 TL yerine 49,90 TL !.. Kişi Başı Gecelik 100 TL 50 TL %50¡ Paylaş: [IMAGE] [IMAGE] LEGACY OTTOMAN HOTEL SİRKECİ/İSTANBUL Legacy Ottoman Hotel'de Tek Gece Konaklama, Açık Büfe Sabah Kahvaltısı, Odaya Meyve Sepeti, Kapalı Havuz, Sauna ve Hamam Kullanımı Kişibaşı Sadece 134,5 TL Kişi Başı Gecelik 275 TL 135 TL %51¡ Paylaş: [IMAGE] !! TatilZemini.com'dan bir daha e-posta almak istemiyorsanız lütfen tıklayınız. TATİLZEMİNİ ÖDEME ŞEKİLLERİ BASTIYALI TURİZM İŞLETMELERİ TİCARET A.Ş. Her hakkı saklıdır. © 2011 MERKEZ OFİS Adres : 1375 Sok. No:25 D.201 Cumhuriyet İş hanı 35210 Alsancak / İZMİR Tel : 0 232 464 12 96 (pbx) Faks : 0 232 464 14 81 E-Mail : i...@tatilzemini.com İSTANBUL SATIŞ OFİSİ Adres : Leylak Sokak Servet Apartmanı No:1/5 Dikilitaş - Beşiktaş 34349 İSTANBUL Tel : 0 212 263 42 63 Faks : 0 212 263 67 88 E-Mail : i...@tatilzemini.com facebook [IMAGE]
