diff options
158 files changed, 17 insertions, 8050 deletions
@@ -12155,3 +12155,20 @@ www/unit-go||2019-04-01|Has expired: Go libraries should not be packaged www/webgo||2019-04-01|Has expired: Go libraries should not be packaged www/go-fasthttp||2019-04-01|Has expired: Go libraries should not be packaged graphics/llpp||2019-04-01|Has expired: fails to build with mupdf 1.14.0 and unable to update due to outdated lang/ocaml +chinese/reciteword||2019-04-04|Has expired: depends on audio/esound +comms/conserver||2019-04-04|Has expired: Superseeded by comms/conserver-com +databases/flamerobin||2019-04-04|Has expired: Abandonware since 2009, does not work with newer version of wxGTK +databases/mariadb100-client|databases/mariadb101-client|2019-04-04|Has expired: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) +databases/mariadb100-server|databases/mariadb101-server|2019-04-04|Has expired: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) +devel/physfs-devel|devel/physfs|2019-04-04|Has expired: is the same as devel/physfs, serving no purpose +devel/py-construct28|devel/py-construct|2019-04-04|Has expired: Latest upstream version is in ports tree devel/py-construct +devel/xtoolchain-llvm40||2019-04-04|Has expired: No supported release uses this version +devel/xtoolchain-llvm50||2019-04-04|Has expired: No supported release uses this version +finance/aqmoney||2019-04-04|Has expired: no longer maintained upstream +finance/openhbci||2019-04-04|Has expired: no longer maintained upstream +graphics/py-exiv2||2019-04-04|Has expired: py-exiv2 has been deprecated in favour of GExiv2 +mail/dbmail22|mail/dbmail|2019-04-04|Has expired: Please use mail/dbmail which uses latest version of 3.X +net/rubygem-fog-google17|net/rubygem-fog-google|2019-04-04|Has expired: Use net/rubygem-fog-google instead +ports-mgmt/bsdadminscripts|ports-mgmt/bsdadminscripts2|2019-04-04|Has expired: Upstream stale nearly 10 years, no longer works properly, use ports-mgmt/bsdadminscripts2 instead +www/mod_md-devel||2019-04-04|Has expired: Use the module that is shipped with Apache 2.4 +x11/xbelld||2019-04-04|Has expired: Depends on audio/esound diff --git a/chinese/Makefile b/chinese/Makefile index 5ee269d54cca..7449046992d1 100644 --- a/chinese/Makefile +++ b/chinese/Makefile @@ -94,7 +94,6 @@ SUBDIR += pycangjie SUBDIR += pyzy SUBDIR += qe - SUBDIR += reciteword SUBDIR += scim-fcitx SUBDIR += scim-pinyin SUBDIR += scim-tables diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile deleted file mode 100644 index 1292bee95f79..000000000000 --- a/chinese/reciteword/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Created by: hamigua <hamigua@cuc.cn> -# $FreeBSD$ - -PORTNAME= reciteword -PORTVERSION= 0.8.5 -PORTREVISION= 2 -CATEGORIES= chinese -MASTER_SITES= SF \ - SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \ - SF/${PORTNAME}/${PORTNAME}-dicts/0.8.2:dicts -DISTFILES= ${DISTNAME}.tar.bz2 \ - ${PORTNAME}-books-${PORTVERSION}.tar.bz2:books \ - ${PORTNAME}-dicts-0.8.2.tar.bz2:dicts - -MAINTAINER= ports@FreeBSD.org -COMMENT= Education software to help people to study English - -DEPRECATED= depends on audio/esound -EXPIRATION_DATE= 2019-03-25 - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS= libespeak.so:audio/espeak - -USES= compiler:c++11-lang tar:bzip2 gettext gmake gnome localbase \ - pkgconfig -GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool esound - -CXXFLAGS+= -Wno-reserved-user-defined-literal - -PORTDOCS= AUTHORS ChangeLog INSTALL README readme.txt - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|' ${WRKSRC}/src/readword.cpp - -post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKDIR} && ${COPYTREE_SHARE} "books dicts" ${STAGEDIR}${DATADIR} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/chinese/reciteword/distinfo b/chinese/reciteword/distinfo deleted file mode 100644 index 49ff67b52a6a..000000000000 --- a/chinese/reciteword/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -SHA256 (reciteword-0.8.5.tar.bz2) = d0b0ec916148bb0bade75ef5d270a254e6e8c6c69fb96cddbcc4f840652b545c -SIZE (reciteword-0.8.5.tar.bz2) = 7728960 -SHA256 (reciteword-books-0.8.5.tar.bz2) = a5405e118bb90931fb8d5a5394591b4493197fe3af3e98ee7086d843b9e578eb -SIZE (reciteword-books-0.8.5.tar.bz2) = 6548327 -SHA256 (reciteword-dicts-0.8.2.tar.bz2) = 9b245749501b52e199d46660972d02da5e2ae800a462045fb75dff6d54f96eec -SIZE (reciteword-dicts-0.8.2.tar.bz2) = 2430470 diff --git a/chinese/reciteword/pkg-descr b/chinese/reciteword/pkg-descr deleted file mode 100644 index 7962283eafc5..000000000000 --- a/chinese/reciteword/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Reciteword is a education software to help people to study English, -reciting english words. It have very beautiful interface, make reciting -word being a interesting things. - -WWW: http://reciteword.sourceforge.net/ diff --git a/chinese/reciteword/pkg-plist b/chinese/reciteword/pkg-plist deleted file mode 100644 index 11d7ac58a424..000000000000 --- a/chinese/reciteword/pkg-plist +++ /dev/null @@ -1,584 +0,0 @@ -bin/reciteword -share/applications/reciteword.desktop -share/applications/rwdict.desktop -share/locale/zh_CN/LC_MESSAGES/reciteword.mo -share/pixmaps/reciteword.png -share/pixmaps/rwdict.png -%%DATADIR%%/books/fkbdc/GREzhjjs.bok -%%DATADIR%%/books/fkbdc/GREzhjjx.bok -%%DATADIR%%/books/fkbdc/czyych.bok -%%DATADIR%%/books/fkbdc/dirname -%%DATADIR%%/books/fkbdc/dxljch.bok -%%DATADIR%%/books/fkbdc/dxljch500z1.bok -%%DATADIR%%/books/fkbdc/dxljch500z2.bok -%%DATADIR%%/books/fkbdc/dxljch500z3.bok -%%DATADIR%%/books/fkbdc/dxljch500z4.bok -%%DATADIR%%/books/fkbdc/dxljch500z5.bok -%%DATADIR%%/books/fkbdc/dxsjch.bok -%%DATADIR%%/books/fkbdc/gzyych.bok -%%DATADIR%%/books/fkbdc/jsjch.bok -%%DATADIR%%/books/fkbdc/tofel.bok -%%DATADIR%%/books/fkbdc/yjsrxch.bok -%%DATADIR%%/books/ljjy/dirname -%%DATADIR%%/books/ljjy/dxclzhjy.bok -%%DATADIR%%/books/ljjy/dxcxjy.bok -%%DATADIR%%/books/ljjy/dxczjy.bok -%%DATADIR%%/books/ljjy/dxdbjy.bok -%%DATADIR%%/books/ljjy/dxlxjy.bok -%%DATADIR%%/books/ljjy/zxcxjy.bok -%%DATADIR%%/books/ljjy/zxczjy.bok -%%DATADIR%%/books/ljjy/zxdbjy.bok -%%DATADIR%%/books/ljjy/zxlxjy.bok -%%DATADIR%%/books/qqssbdc/21sjdx/Ck-c4.bok -%%DATADIR%%/books/qqssbdc/21sjdx/ck-c7.bok -%%DATADIR%%/books/qqssbdc/21sjdx/ck-c8.bok -%%DATADIR%%/books/qqssbdc/21sjdx/ck-c9.bok -%%DATADIR%%/books/qqssbdc/21sjdx/dirname -%%DATADIR%%/books/qqssbdc/AAAyy/Ck-3c.bok -%%DATADIR%%/books/qqssbdc/AAAyy/ck-3a.bok -%%DATADIR%%/books/qqssbdc/AAAyy/ck-3b.bok -%%DATADIR%%/books/qqssbdc/AAAyy/dirname -%%DATADIR%%/books/qqssbdc/GMAT/ck-ga.bok -%%DATADIR%%/books/qqssbdc/GMAT/ck-gg.bok -%%DATADIR%%/books/qqssbdc/GMAT/ck-gm.bok -%%DATADIR%%/books/qqssbdc/GMAT/ck-gt.bok -%%DATADIR%%/books/qqssbdc/GRE/CK-gr.bok -%%DATADIR%%/books/qqssbdc/GRE/ck-gn.bok -%%DATADIR%%/books/qqssbdc/GRE/ck-r1.bok -%%DATADIR%%/books/qqssbdc/GRE/ck-r2.bok -%%DATADIR%%/books/qqssbdc/GRE/ck-ts.bok -%%DATADIR%%/books/qqssbdc/IELTS/ck-is.bok -%%DATADIR%%/books/qqssbdc/IELTS/dirname -%%DATADIR%%/books/qqssbdc/MBAdg/Ck-^3.bok -%%DATADIR%%/books/qqssbdc/MBAdg/ck-mq.bok -%%DATADIR%%/books/qqssbdc/MBAdg/dirname -%%DATADIR%%/books/qqssbdc/TOEFL/CK-tf.bok -%%DATADIR%%/books/qqssbdc/TOEFL/CK-tl.bok -%%DATADIR%%/books/qqssbdc/TOEFL/CK-to.bok -%%DATADIR%%/books/qqssbdc/TOEFL/CK-tt.bok -%%DATADIR%%/books/qqssbdc/TOEFL/Ck-^5.bok -%%DATADIR%%/books/qqssbdc/TOEFL/Ck-^6.bok -%%DATADIR%%/books/qqssbdc/TOEFL/Ck-^7.bok -%%DATADIR%%/books/qqssbdc/TOEFL/Ck-tz.bok -%%DATADIR%%/books/qqssbdc/TOEIC/Ck-^2.bok -%%DATADIR%%/books/qqssbdc/VOCABULARY/ck-cy.bok -%%DATADIR%%/books/qqssbdc/VOCABULARY/ck-lc.bok -%%DATADIR%%/books/qqssbdc/VOCABULARY/ck-lw.bok -%%DATADIR%%/books/qqssbdc/VOCABULARY/ck-ly.bok -%%DATADIR%%/books/qqssbdc/XXXyy/Ck-F1.bok -%%DATADIR%%/books/qqssbdc/XXXyy/dirname -%%DATADIR%%/books/qqssbdc/bjbcz/ck-21.bok -%%DATADIR%%/books/qqssbdc/bjbcz/ck-22.bok -%%DATADIR%%/books/qqssbdc/bjbcz/ck-23.bok -%%DATADIR%%/books/qqssbdc/bjbcz/ck-24.bok -%%DATADIR%%/books/qqssbdc/bjbcz/ck-25.bok -%%DATADIR%%/books/qqssbdc/bjbcz/ck-26.bok -%%DATADIR%%/books/qqssbdc/bjbcz/dirname -%%DATADIR%%/books/qqssbdc/bjbxx/Ck-k2.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-03.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-04.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-vv.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-xa.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-xb.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-xe.bok -%%DATADIR%%/books/qqssbdc/bjbxx/ck-xf.bok -%%DATADIR%%/books/qqssbdc/bjbxx/dirname -%%DATADIR%%/books/qqssbdc/bsdcz/CK-K8.bok -%%DATADIR%%/books/qqssbdc/bsdcz/Ck-I4.bok -%%DATADIR%%/books/qqssbdc/bsdcz/Ck-I5.bok -%%DATADIR%%/books/qqssbdc/bsdcz/dirname -%%DATADIR%%/books/qqssbdc/cd/ck-33.bok -%%DATADIR%%/books/qqssbdc/cd/dirname -%%DATADIR%%/books/qqssbdc/cpfjch/ck-j1.bok -%%DATADIR%%/books/qqssbdc/cpfjch/ck-j2.bok -%%DATADIR%%/books/qqssbdc/cpfjch/ck-j3.bok -%%DATADIR%%/books/qqssbdc/cpfjch/ck-j4.bok -%%DATADIR%%/books/qqssbdc/cpfjch/ck-j5.bok -%%DATADIR%%/books/qqssbdc/cpfjch/dirname -%%DATADIR%%/books/qqssbdc/crgk/ck-cr.bok -%%DATADIR%%/books/qqssbdc/crgk/ck-qz.bok -%%DATADIR%%/books/qqssbdc/crgk/dirname -%%DATADIR%%/books/qqssbdc/cykych/ck-kb.bok -%%DATADIR%%/books/qqssbdc/cykych/ck-kd.bok -%%DATADIR%%/books/qqssbdc/cykych/ck-kj.bok -%%DATADIR%%/books/qqssbdc/cykych/ck-kq.bok -%%DATADIR%%/books/qqssbdc/cykych/ck-ks.bok -%%DATADIR%%/books/qqssbdc/cykych/dirname -%%DATADIR%%/books/qqssbdc/dddxyy/ck-z1.bok -%%DATADIR%%/books/qqssbdc/dddxyy/dirname -%%DATADIR%%/books/qqssbdc/ddyy/ck-da.bok -%%DATADIR%%/books/qqssbdc/ddyy/ck-db.bok -%%DATADIR%%/books/qqssbdc/ddyy/ck-dd.bok -%%DATADIR%%/books/qqssbdc/ddyy/ck-dm.bok -%%DATADIR%%/books/qqssbdc/ddyy/dirname -%%DATADIR%%/books/qqssbdc/dirname -%%DATADIR%%/books/qqssbdc/dxchdg/ck-v6.bok -%%DATADIR%%/books/qqssbdc/dxchdg/dirname -%%DATADIR%%/books/qqssbdc/dxtyyy/Ck-%2.bok -%%DATADIR%%/books/qqssbdc/dxtyyy/Ck-%3.bok -%%DATADIR%%/books/qqssbdc/dxtyyy/dirname -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-5j.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-6j.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d0.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d1.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d2.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d3.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d4.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/ck-d5.bok -%%DATADIR%%/books/qqssbdc/dxyyjd/dirname -%%DATADIR%%/books/qqssbdc/dxyyzy/Ck-ae.bok -%%DATADIR%%/books/qqssbdc/dxyyzy/dirname -%%DATADIR%%/books/qqssbdc/dzyy/Ck-dp.bok -%%DATADIR%%/books/qqssbdc/dzyy/ck-du.bok -%%DATADIR%%/books/qqssbdc/dzyy/dirname -%%DATADIR%%/books/qqssbdc/ggyy/CK-P1.bok -%%DATADIR%%/books/qqssbdc/ggyy/CK-P3.bok -%%DATADIR%%/books/qqssbdc/ggyy/CK-TQ.bok -%%DATADIR%%/books/qqssbdc/ggyy/ck-@8.bok -%%DATADIR%%/books/qqssbdc/ggyy/ck-ky.bok -%%DATADIR%%/books/qqssbdc/ggyy/ck-p2.bok -%%DATADIR%%/books/qqssbdc/ggyy/ck-p4.bok -%%DATADIR%%/books/qqssbdc/ggyy/ck-p5.bok -%%DATADIR%%/books/qqssbdc/ggyy/dirname -%%DATADIR%%/books/qqssbdc/gkch/Ck-HN.bok -%%DATADIR%%/books/qqssbdc/gkch/ck-gn-old.bok -%%DATADIR%%/books/qqssbdc/gkch/ck-gz.bok -%%DATADIR%%/books/qqssbdc/gkch/dirname -%%DATADIR%%/books/qqssbdc/gzxx/Ck-$5.bok -%%DATADIR%%/books/qqssbdc/gzxx/dirname -%%DATADIR%%/books/qqssbdc/gzyy/ck-g5.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-g6.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-g7.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-g8.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-g9.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-gc.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-gd.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-ge.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-gf.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-gs.bok -%%DATADIR%%/books/qqssbdc/gzyy/ck-zh.bok -%%DATADIR%%/books/qqssbdc/gzyy/dirname -%%DATADIR%%/books/qqssbdc/hbbgz/Ck-I3.bok -%%DATADIR%%/books/qqssbdc/hbbgz/dirname -%%DATADIR%%/books/qqssbdc/jqgj/Ck-$8.bok -%%DATADIR%%/books/qqssbdc/jqgj/dirname -%%DATADIR%%/books/qqssbdc/jqseyy/ck-ja.bok -%%DATADIR%%/books/qqssbdc/jqseyy/ck-jb.bok -%%DATADIR%%/books/qqssbdc/jqseyy/ck-je.bok -%%DATADIR%%/books/qqssbdc/jqseyy/ck-jf.bok -%%DATADIR%%/books/qqssbdc/jqseyy/ck-jg.bok -%%DATADIR%%/books/qqssbdc/jqseyy/ck-jh.bok -%%DATADIR%%/books/qqssbdc/jqseyy/dirname -%%DATADIR%%/books/qqssbdc/jsjyy/ck-dc.bok -%%DATADIR%%/books/qqssbdc/jsjyy/ck-dz.bok -%%DATADIR%%/books/qqssbdc/jsjyy/dirname -%%DATADIR%%/books/qqssbdc/jsscz/ck-jj.bok -%%DATADIR%%/books/qqssbdc/jsscz/ck-kk.bok -%%DATADIR%%/books/qqssbdc/jsscz/ck-ll.bok -%%DATADIR%%/books/qqssbdc/jsscz/ck-mm.bok -%%DATADIR%%/books/qqssbdc/jsscz/dirname -%%DATADIR%%/books/qqssbdc/ktxxx/ck-l1.bok -%%DATADIR%%/books/qqssbdc/ktxxx/ck-l2.bok -%%DATADIR%%/books/qqssbdc/ktxxx/ck-l3.bok -%%DATADIR%%/books/qqssbdc/ktxxx/ck-l4.bok -%%DATADIR%%/books/qqssbdc/ktxxx/dirname -%%DATADIR%%/books/qqssbdc/kydg/CK-$9.bok -%%DATADIR%%/books/qqssbdc/kydg/dirname -%%DATADIR%%/books/qqssbdc/kydjks/ck-rr.bok -%%DATADIR%%/books/qqssbdc/kydjks/dirname -%%DATADIR%%/books/qqssbdc/lsxyy/ck-lt.bok -%%DATADIR%%/books/qqssbdc/lsxyy/dirname -%%DATADIR%%/books/qqssbdc/ltseyy/ck-ee.bok -%%DATADIR%%/books/qqssbdc/ltseyy/ck-ff.bok -%%DATADIR%%/books/qqssbdc/ltseyy/dirname -%%DATADIR%%/books/qqssbdc/mgyyjc/ck-ls.bok -%%DATADIR%%/books/qqssbdc/mgyyjc/ck-lu.bok -%%DATADIR%%/books/qqssbdc/mgyyjc/ck-lx.bok -%%DATADIR%%/books/qqssbdc/mgyyjc/ck-lz.bok -%%DATADIR%%/books/qqssbdc/mgyyjc/dirname -%%DATADIR%%/books/qqssbdc/mgzy/ck-ss.bok -%%DATADIR%%/books/qqssbdc/mgzy/dirname -%%DATADIR%%/books/qqssbdc/njcz/Ck-&4.bok -%%DATADIR%%/books/qqssbdc/njcz/Ck-&5.bok -%%DATADIR%%/books/qqssbdc/njcz/dirname -%%DATADIR%%/books/qqssbdc/njczyy/Ck-HK.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-i7.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-i8.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-i9.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-k6.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-k7.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-s7.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-s8.bok -%%DATADIR%%/books/qqssbdc/njczyy/Ck-s9.bok -%%DATADIR%%/books/qqssbdc/njczyy/dirname -%%DATADIR%%/books/qqssbdc/njgzyy/Ck-oy.bok -%%DATADIR%%/books/qqssbdc/njgzyy/Ck-oz.bok -%%DATADIR%%/books/qqssbdc/njgzyy/Ck-pz.bok -%%DATADIR%%/books/qqssbdc/njgzyy/ck-ox.bok -%%DATADIR%%/books/qqssbdc/njgzyy/dirname -%%DATADIR%%/books/qqssbdc/njxxyy/ck-nh.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-nj.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oa.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-ob.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oc.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-od.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oe.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-of.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-og.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oh.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oi.bok -%%DATADIR%%/books/qqssbdc/njxxyy/ck-oj.bok -%%DATADIR%%/books/qqssbdc/njxxyy/dirname -%%DATADIR%%/books/qqssbdc/pgych/ck-a1.bok -%%DATADIR%%/books/qqssbdc/pgych/ck-a2.bok -%%DATADIR%%/books/qqssbdc/pgych/ck-a3.bok -%%DATADIR%%/books/qqssbdc/pgych/ck-a4.bok -%%DATADIR%%/books/qqssbdc/pgych/ck-a5.bok -%%DATADIR%%/books/qqssbdc/pgych/dirname -%%DATADIR%%/books/qqssbdc/qt/Ck-x8.bok -%%DATADIR%%/books/qqssbdc/qt/ck-01.bok -%%DATADIR%%/books/qqssbdc/qt/dirname -%%DATADIR%%/books/qqssbdc/rjbcz/ck-b1.bok -%%DATADIR%%/books/qqssbdc/rjbcz/ck-b2.bok -%%DATADIR%%/books/qqssbdc/rjbcz/ck-b3.bok -%%DATADIR%%/books/qqssbdc/rjbcz/dirname -%%DATADIR%%/books/qqssbdc/rjbxx/Ck-fh.bok -%%DATADIR%%/books/qqssbdc/rjbxx/Ck-fi.bok -%%DATADIR%%/books/qqssbdc/rjbxx/Ck-fj.bok -%%DATADIR%%/books/qqssbdc/rjbxx/Ck-fk.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e1.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e2.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e3.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e4.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e5.bok -%%DATADIR%%/books/qqssbdc/rjbxx/ck-e6.bok -%%DATADIR%%/books/qqssbdc/rjbxx/dirname -%%DATADIR%%/books/qqssbdc/shbjc/ck-h1.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h2.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h3.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h4.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h5.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h6.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h7.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h8.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-h9.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-ha.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hb.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hc.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hd.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-he.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hf.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hg.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hi.bok -%%DATADIR%%/books/qqssbdc/shbjc/ck-hj.bok -%%DATADIR%%/books/qqssbdc/shbjc/dirname -%%DATADIR%%/books/qqssbdc/shdjks/ck-st.bok -%%DATADIR%%/books/qqssbdc/shdjks/dirname -%%DATADIR%%/books/qqssbdc/swyy/ck-sw.bok -%%DATADIR%%/books/qqssbdc/swyy/dirname -%%DATADIR%%/books/qqssbdc/sxsyy/CK-s1.bok -%%DATADIR%%/books/qqssbdc/sxsyy/CK-s2.bok -%%DATADIR%%/books/qqssbdc/sxsyy/CK-s3.bok -%%DATADIR%%/books/qqssbdc/sxsyy/dirname -%%DATADIR%%/books/qqssbdc/tdxl/Ck-nu.bok -%%DATADIR%%/books/qqssbdc/tdxl/dirname -%%DATADIR%%/books/qqssbdc/wmyy/ck-w1.bok -%%DATADIR%%/books/qqssbdc/wmyy/ck-w2.bok -%%DATADIR%%/books/qqssbdc/wmyy/ck-w3.bok -%%DATADIR%%/books/qqssbdc/wmyy/ck-w4.bok -%%DATADIR%%/books/qqssbdc/wmyy/dirname -%%DATADIR%%/books/qqssbdc/wybcz/ck-27.bok -%%DATADIR%%/books/qqssbdc/wybcz/ck-28.bok -%%DATADIR%%/books/qqssbdc/wybcz/ck-29.bok -%%DATADIR%%/books/qqssbdc/wybcz/ck-30.bok -%%DATADIR%%/books/qqssbdc/wybcz/ck-31.bok -%%DATADIR%%/books/qqssbdc/wybcz/ck-32.bok -%%DATADIR%%/books/qqssbdc/wybcz/dirname -%%DATADIR%%/books/qqssbdc/xbdxyy/Ck-x6.bok -%%DATADIR%%/books/qqssbdc/xbdxyy/ck-x5.bok -%%DATADIR%%/books/qqssbdc/xbdxyy/ck-xd.bok -%%DATADIR%%/books/qqssbdc/xbdxyy/ck-zy.bok -%%DATADIR%%/books/qqssbdc/xbdxyy/dirname -%%DATADIR%%/books/qqssbdc/xbjbxx/ck-93.bok -%%DATADIR%%/books/qqssbdc/xbjbxx/ck-95.bok -%%DATADIR%%/books/qqssbdc/xbjbxx/ck-97.bok -%%DATADIR%%/books/qqssbdc/xbjbxx/dirname -%%DATADIR%%/books/qqssbdc/xbjqse/Ck-44.bok -%%DATADIR%%/books/qqssbdc/xbjqse/ck-66.bok -%%DATADIR%%/books/qqssbdc/xbjqse/dirname -%%DATADIR%%/books/qqssbdc/xbzgz/Ck-J8.bok -%%DATADIR%%/books/qqssbdc/xbzgz/dirname -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-@2.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-@3.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-@4.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-@5.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-@7.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-I2.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-k1.bok -%%DATADIR%%/books/qqssbdc/xbzxx/Ck-xy.bok -%%DATADIR%%/books/qqssbdc/xbzxx/dirname -%%DATADIR%%/books/qqssbdc/xdxdg/ck-lh.bok -%%DATADIR%%/books/qqssbdc/xdxdg/ck-lj.bok -%%DATADIR%%/books/qqssbdc/xdxdg/ck-vs.bok -%%DATADIR%%/books/qqssbdc/xdxdg/dirname -%%DATADIR%%/books/qqssbdc/xglyy/ck-n5.bok -%%DATADIR%%/books/qqssbdc/xglyy/ck-n6.bok -%%DATADIR%%/books/qqssbdc/xglyy/ck-n7.bok -%%DATADIR%%/books/qqssbdc/xglyy/ck-n8.bok -%%DATADIR%%/books/qqssbdc/xglyy/dirname -%%DATADIR%%/books/qqssbdc/xgzyy/ck-x7.bok -%%DATADIR%%/books/qqssbdc/xgzyy/ck-xg.bok -%%DATADIR%%/books/qqssbdc/xgzyy/ck-xh.bok -%%DATADIR%%/books/qqssbdc/xgzyy/ck-xz.bok -%%DATADIR%%/books/qqssbdc/xgzyy/dirname -%%DATADIR%%/books/qqssbdc/xmbcz/CK-MX.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-@1.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-HM.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-k3.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-k4.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-k5.bok -%%DATADIR%%/books/qqssbdc/xmbcz/Ck-qq.bok -%%DATADIR%%/books/qqssbdc/xmbcz/ck-02.bok -%%DATADIR%%/books/qqssbdc/xmbcz/ck-o1.bok -%%DATADIR%%/books/qqssbdc/xmbcz/ck-pp.bok -%%DATADIR%%/books/qqssbdc/xmbcz/ck-x1.bok -%%DATADIR%%/books/qqssbdc/xmbcz/dirname -%%DATADIR%%/books/qqssbdc/xmbrj/Ck-gq.bok -%%DATADIR%%/books/qqssbdc/xmbrj/dirname -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-na.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-nb.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-nc.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-nd.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-ne.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/ck-nf.bok -%%DATADIR%%/books/qqssbdc/xrjbcz/dirname -%%DATADIR%%/books/qqssbdc/xrjbgz/CK-$3.bok -%%DATADIR%%/books/qqssbdc/xrjbgz/Ck-J7.bok -%%DATADIR%%/books/qqssbdc/xrjbgz/Ck-qw.bok -%%DATADIR%%/books/qqssbdc/xrjbgz/Ck-qx.bok -%%DATADIR%%/books/qqssbdc/xrjbgz/ck-c1.bok -%%DATADIR%%/books/qqssbdc/xrjbgz/dirname -%%DATADIR%%/books/qqssbdc/xrjbxx/Ck-q5.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/Ck-q6.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-T4.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-q1.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-q3.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-q4.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-t1.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-t2.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/ck-t3.bok -%%DATADIR%%/books/qqssbdc/xrjbxx/dirname -%%DATADIR%%/books/qqssbdc/xrjgz/Ck-%1.bok -%%DATADIR%%/books/qqssbdc/xrjgz/dirname -%%DATADIR%%/books/qqssbdc/xsjgz/Ck-J6.bok -%%DATADIR%%/books/qqssbdc/xsjgz/Ck-xs.bok -%%DATADIR%%/books/qqssbdc/xsjgz/dirname -%%DATADIR%%/books/qqssbdc/xsjxx/CK-Z8.bok -%%DATADIR%%/books/qqssbdc/xsjxx/Ck-$7.bok -%%DATADIR%%/books/qqssbdc/xsjxx/Ck-I6.bok -%%DATADIR%%/books/qqssbdc/xsjxx/Ck-J9.bok -%%DATADIR%%/books/qqssbdc/xsjxx/Ck-^1.bok -%%DATADIR%%/books/qqssbdc/xsjxx/Ck-xx.bok -%%DATADIR%%/books/qqssbdc/xsjxx/dirname -%%DATADIR%%/books/qqssbdc/xsydx/Ck-t7.bok -%%DATADIR%%/books/qqssbdc/xsydx/Ck-t8.bok -%%DATADIR%%/books/qqssbdc/xsydx/Ck-t9.bok -%%DATADIR%%/books/qqssbdc/xsydx/dirname -%%DATADIR%%/books/qqssbdc/xxxyy2/Ck-$1.bok -%%DATADIR%%/books/qqssbdc/xxxyy2/Ck-$2.bok -%%DATADIR%%/books/qqssbdc/xxxyy2/dirname -%%DATADIR%%/books/qqssbdc/yhbxx/Ck-^4.bok -%%DATADIR%%/books/qqssbdc/yhbxx/Ck-q8.bok -%%DATADIR%%/books/qqssbdc/yhbxx/Ck-y0.bok -%%DATADIR%%/books/qqssbdc/yhbxx/Ck-y5.bok -%%DATADIR%%/books/qqssbdc/yhbxx/Ck-y9.bok -%%DATADIR%%/books/qqssbdc/yhbxx/ck-y6.bok -%%DATADIR%%/books/qqssbdc/yhbxx/ck-y7.bok -%%DATADIR%%/books/qqssbdc/yhbxx/ck-y8.bok -%%DATADIR%%/books/qqssbdc/yhbxx/dirname -%%DATADIR%%/books/qqssbdc/yjsyy/Ck-9u.bok -%%DATADIR%%/books/qqssbdc/yjsyy/ck-dg.bok -%%DATADIR%%/books/qqssbdc/yjsyy/ck-yj.bok -%%DATADIR%%/books/qqssbdc/yjsyy/ck-zt.bok -%%DATADIR%%/books/qqssbdc/yjsyy/dirname -%%DATADIR%%/books/qqssbdc/yjxx/CK-61.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-62.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-63.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-64.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-65.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-66.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-67.bok -%%DATADIR%%/books/qqssbdc/yjxx/CK-68.bok -%%DATADIR%%/books/qqssbdc/yjxx/dirname -%%DATADIR%%/books/qqssbdc/ylbcz/CK-K9.bok -%%DATADIR%%/books/qqssbdc/ylbcz/dirname -%%DATADIR%%/books/qqssbdc/yxyy/ck-y1.bok -%%DATADIR%%/books/qqssbdc/yxyy/ck-y2.bok -%%DATADIR%%/books/qqssbdc/yxyy/ck-y3.bok -%%DATADIR%%/books/qqssbdc/yxyy/dirname -%%DATADIR%%/books/qqssbdc/yy/Ck-$4.bok -%%DATADIR%%/books/qqssbdc/yy/Ck-$6.bok -%%DATADIR%%/books/qqssbdc/yy/Ck-g1.bok -%%DATADIR%%/books/qqssbdc/yy/dirname -%%DATADIR%%/books/qqssbdc/zbmg/CK-M2.bok -%%DATADIR%%/books/qqssbdc/zbmg/ck-m1.bok -%%DATADIR%%/books/qqssbdc/zbmg/dirname -%%DATADIR%%/books/qqssbdc/zcyy/ck-zs.bok -%%DATADIR%%/books/qqssbdc/zcyy/ck-zx.bok -%%DATADIR%%/books/qqssbdc/zcyy/ck-zz.bok -%%DATADIR%%/books/qqssbdc/zcyy/dirname -%%DATADIR%%/books/qqssbdc/zhyy/ck-zd.bok -%%DATADIR%%/books/qqssbdc/zhyy/ck-ze.bok -%%DATADIR%%/books/qqssbdc/zhyy/ck-zf.bok -%%DATADIR%%/books/qqssbdc/zhyy/ck-zg.bok -%%DATADIR%%/books/qqssbdc/zhyy/dirname -%%DATADIR%%/books/qqssbdc/zk/Ck-dk.bok -%%DATADIR%%/books/qqssbdc/zk/ck-bk.bok -%%DATADIR%%/books/qqssbdc/zk/ck-bs.bok -%%DATADIR%%/books/qqssbdc/zk/ck-bx.bok -%%DATADIR%%/books/qqssbdc/zk/ck-cq.bok -%%DATADIR%%/books/qqssbdc/zk/ck-te.bok -%%DATADIR%%/books/qqssbdc/zk/ck-zk.bok -%%DATADIR%%/books/qqssbdc/zk/ck-zl.bok -%%DATADIR%%/books/qqssbdc/zk/dirname -%%DATADIR%%/books/qqssbdc/zwwl/ck-la.bok -%%DATADIR%%/books/qqssbdc/zwwl/ck-lb.bok -%%DATADIR%%/books/qqssbdc/zwwl/ck-z5.bok -%%DATADIR%%/books/qqssbdc/zwwl/ck-z6.bok -%%DATADIR%%/books/qqssbdc/zwwl/ck-z7.bok -%%DATADIR%%/books/qqssbdc/zwwl/dirname -%%DATADIR%%/books/wyabdc/CET56cz.bok -%%DATADIR%%/books/wyabdc/CZ1_new.bok -%%DATADIR%%/books/wyabdc/CZ2_new.bok -%%DATADIR%%/books/wyabdc/CZ3_new.bok -%%DATADIR%%/books/wyabdc/DXcz.bok -%%DATADIR%%/books/wyabdc/GRENXAll.bok -%%DATADIR%%/books/wyabdc/LasyWord.bok -%%DATADIR%%/books/wyabdc/TOEFLCiHui.bok -%%DATADIR%%/books/wyabdc/Taisha200207.bok -%%DATADIR%%/books/wyabdc/XX1_new.bok -%%DATADIR%%/books/wyabdc/XX2_new.bok -%%DATADIR%%/books/wyabdc/XX3_new.bok -%%DATADIR%%/books/wyabdc/XX4_new.bok -%%DATADIR%%/books/wyabdc/XX5_new.bok -%%DATADIR%%/books/wyabdc/YJScz.bok -%%DATADIR%%/books/wyabdc/ZCa.bok -%%DATADIR%%/books/wyabdc/ZCb.bok -%%DATADIR%%/books/wyabdc/ZCc.bok -%%DATADIR%%/books/wyabdc/cet4.bok -%%DATADIR%%/books/wyabdc/cet6.bok -%%DATADIR%%/books/wyabdc/commerce.bok -%%DATADIR%%/books/wyabdc/computer.bok -%%DATADIR%%/books/wyabdc/cz1.bok -%%DATADIR%%/books/wyabdc/cz2.bok -%%DATADIR%%/books/wyabdc/cz3.bok -%%DATADIR%%/books/wyabdc/cz4.bok -%%DATADIR%%/books/wyabdc/cz5.bok -%%DATADIR%%/books/wyabdc/cz6.bok -%%DATADIR%%/books/wyabdc/dirname -%%DATADIR%%/books/wyabdc/gjzx.bok -%%DATADIR%%/books/wyabdc/gmat.bok -%%DATADIR%%/books/wyabdc/gre.bok -%%DATADIR%%/books/wyabdc/grecp.bok -%%DATADIR%%/books/wyabdc/grecpzm.bok -%%DATADIR%%/books/wyabdc/gredyc.bok -%%DATADIR%%/books/wyabdc/gz1.bok -%%DATADIR%%/books/wyabdc/gz2.bok -%%DATADIR%%/books/wyabdc/gz3.bok -%%DATADIR%%/books/wyabdc/ielts.bok -%%DATADIR%%/books/wyabdc/lyyu365.bok -%%DATADIR%%/books/wyabdc/nce1.bok -%%DATADIR%%/books/wyabdc/nce2.bok -%%DATADIR%%/books/wyabdc/nce3.bok -%%DATADIR%%/books/wyabdc/nce4.bok -%%DATADIR%%/books/wyabdc/pp2.bok -%%DATADIR%%/books/wyabdc/pp2_lbfyc.bok -%%DATADIR%%/books/wyabdc/pp2_tk.bok -%%DATADIR%%/books/wyabdc/sjjd1.bok -%%DATADIR%%/books/wyabdc/sjjd2.bok -%%DATADIR%%/books/wyabdc/taisha.bok -%%DATADIR%%/books/wyabdc/toefl.bok -%%DATADIR%%/books/wyabdc/toeflcz.bok -%%DATADIR%%/books/wyabdc/wm1.bok -%%DATADIR%%/books/wyabdc/wm2.bok -%%DATADIR%%/books/wyabdc/wm3.bok -%%DATADIR%%/books/wyabdc/wm4.bok -%%DATADIR%%/books/wyabdc/xx1.bok -%%DATADIR%%/books/wyabdc/xx2.bok -%%DATADIR%%/books/wyabdc/xx3.bok -%%DATADIR%%/books/wyabdc/xx4.bok -%%DATADIR%%/books/wyabdc/xx6_new.bok -%%DATADIR%%/books/wyabdc/yjs.bok -%%DATADIR%%/books/wyabdc/yx1.bok -%%DATADIR%%/books/wyabdc/yx2.bok -%%DATADIR%%/books/wyabdc/yx3.bok -%%DATADIR%%/dicts/xdict.lib -%%DATADIR%%/dicts/xdicten.idx -%%DATADIR%%/modules/answerno.wav -%%DATADIR%%/modules/answerno2.wav -%%DATADIR%%/modules/answerok.wav -%%DATADIR%%/modules/back.wav -%%DATADIR%%/modules/bookedit.zh_CN.txt -%%DATADIR%%/modules/buttonactive.wav -%%DATADIR%%/modules/buttondown.wav -%%DATADIR%%/modules/buttonup.wav -%%DATADIR%%/modules/choosebook.zh_CN.txt -%%DATADIR%%/modules/chord.wav -%%DATADIR%%/modules/ding.wav -%%DATADIR%%/modules/filling.zh_CN.txt -%%DATADIR%%/modules/firstrecite.zh_CN.txt -%%DATADIR%%/modules/gunno.wav -%%DATADIR%%/modules/gunok.wav -%%DATADIR%%/modules/hearing.zh_CN.txt -%%DATADIR%%/modules/know.zh_CN.txt -%%DATADIR%%/modules/menushow.wav -%%DATADIR%%/modules/overview.txt -%%DATADIR%%/modules/overview.zh_CN.txt -%%DATADIR%%/modules/rest.zh_CN.txt -%%DATADIR%%/modules/revise.zh_CN.txt -%%DATADIR%%/modules/sentence.zh_CN.txt -%%DATADIR%%/modules/shooting.zh_CN.txt -%%DATADIR%%/modules/type.wav -%%DATADIR%%/modules/typing.zh_CN.txt -%%DATADIR%%/modules/wind.wav -%%DATADIR%%/modules/wordedit.zh_CN.txt -%%DATADIR%%/skins/bdc/about.png -%%DATADIR%%/skins/bdc/aboutr.png -%%DATADIR%%/skins/bdc/choosebook.png -%%DATADIR%%/skins/bdc/choosebookr.png -%%DATADIR%%/skins/bdc/chooseword.png -%%DATADIR%%/skins/bdc/collectword.png -%%DATADIR%%/skins/bdc/collectwordr.png -%%DATADIR%%/skins/bdc/dict.png -%%DATADIR%%/skins/bdc/dictr.png -%%DATADIR%%/skins/bdc/face.png -%%DATADIR%%/skins/bdc/facer.png -%%DATADIR%%/skins/bdc/group.png -%%DATADIR%%/skins/bdc/groupr.png -%%DATADIR%%/skins/bdc/gtkrc -%%DATADIR%%/skins/bdc/help.png -%%DATADIR%%/skins/bdc/helpr.png -%%DATADIR%%/skins/bdc/know.png -%%DATADIR%%/skins/bdc/knowr.png -%%DATADIR%%/skins/bdc/mark.png -%%DATADIR%%/skins/bdc/markr.png -%%DATADIR%%/skins/bdc/record.png -%%DATADIR%%/skins/bdc/recordr.png -%%DATADIR%%/skins/bdc/rest.png -%%DATADIR%%/skins/bdc/restr.png -%%DATADIR%%/skins/bdc/revise_group.png -%%DATADIR%%/skins/bdc/revise_groupr.png -%%DATADIR%%/skins/bdc/revise_skim.png -%%DATADIR%%/skins/bdc/revise_skimr.png -%%DATADIR%%/skins/bdc/revise_test.png -%%DATADIR%%/skins/bdc/revise_testr.png -%%DATADIR%%/skins/bdc/shooting.png -%%DATADIR%%/skins/bdc/shootingr.png -%%DATADIR%%/skins/bdc/skim.png -%%DATADIR%%/skins/bdc/skimr.png -%%DATADIR%%/skins/bdc/skin.inf -%%DATADIR%%/skins/bdc/test.png -%%DATADIR%%/skins/bdc/testr.png -%%DATADIR%%/skins/bdc/text.png -%%DATADIR%%/skins/bdc/typing.png -%%DATADIR%%/skins/bdc/typingr.png diff --git a/comms/Makefile b/comms/Makefile index eb9eb336cc58..4a5757055a64 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -24,7 +24,6 @@ SUBDIR += comserv SUBDIR += concordance SUBDIR += congruity - SUBDIR += conserver SUBDIR += conserver-com SUBDIR += cqrlog SUBDIR += cubicsdr diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile deleted file mode 100644 index 603d60b47ef2..000000000000 --- a/comms/conserver/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# Created by: Peter Wemm <peter@netplex.com.au> -# $FreeBSD$ - -PORTNAME= conserver -PORTVERSION= 8.5 -PORTREVISION= 4 -CATEGORIES= comms -MASTER_SITES= http://www.komquats.com/distfiles/ \ - http://people.freebsd.org/~cy/distfiles/ -EXTRACT_SUFX= .tgz - -MAINTAINER= cy@FreeBSD.org -COMMENT= Manage remote serial consoles via TCP/IP - -DEPRECATED= Superseeded by comms/conserver-com -EXPIRATION_DATE= 2019-03-31 - -BUILD_DEPENDS= makeme:devel/msrc0 \ - mkcmd:devel/mkcmd - -CONFLICTS_INSTALL= conserver-com-[0-9]* - -# Set this to where you want console(8) to connect to by default -# or use something like ``make DEFAULTHOST=myserver.mydomain.net'' -DEFAULTHOST?= localhost -DEFAULTPORT?= 782 -MAKE_ENV+= DEFAULTHOST="${DEFAULTHOST}" DEFAULTPORT="${DEFAULTPORT}" -#PKGMESSAGE= ${WRKDIR}/MESSAGE -USE_RC_SUBR= conserver - -do-build: - ${REINPLACE_CMD} -e 's:/usr/local/lib:${PREFIX}/etc:g' \ - ${WRKSRC}/etc/conserver/cons.h -.for d in etc/conserver etc/console etc/autologin - @(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \ - ${MAKE_ARGS} ${ALL_TARGET}) -.endfor - #@${SED} -e 's:/usr/local:${PREFIX}:g' \ - # ${.CURDIR}/pkg-message > ${PKGMESSAGE} - -do-install: -.for d in etc/conserver etc/console etc/autologin - (cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \ - ${MAKE_ARGS} ${INSTALL_TARGET}) -.endfor - @${INSTALL_DATA} ${WRKSRC}/lib/conserver.cf/conserver.cf \ - ${STAGEDIR}${PREFIX}/etc/conserver.cf.eg - @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \ - ${WRKSRC}/lib/conserver.cf/conserver.cf.man \ - > ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5 - @${SED} -e 's:/usr/local/etc:${PREFIX}/sbin:g' \ - ${WRKSRC}/etc/autologin/autologin.man \ - > ${STAGEDIR}${PREFIX}/man/man8/autologin.8 - @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \ - ${WRKSRC}/etc/conserver/conserver.man \ - > ${STAGEDIR}${PREFIX}/man/man8/conserver.8 - @${SED} -e 's:console\.itsd\.fedex\.com:${DEFAULTHOST}:g' \ - ${WRKSRC}/etc/console/console.man \ - > ${STAGEDIR}${PREFIX}/man/man8/console.8 - @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/man/man5/conserver.cf.5 \ - ${STAGEDIR}${PREFIX}/man/man8/autologin.8 \ - ${STAGEDIR}${PREFIX}/man/man8/conserver.8 \ - ${STAGEDIR}${PREFIX}/man/man8/console.8 - -.include <bsd.port.mk> diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo deleted file mode 100644 index d1965e310130..000000000000 --- a/comms/conserver/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (conserver-8.5.tgz) = cd6c76a6f335c252344751c6d6596136cbbb155cd81003d323f2e2c416205edc -SIZE (conserver-8.5.tgz) = 99743 diff --git a/comms/conserver/files/Makefile b/comms/conserver/files/Makefile deleted file mode 100644 index 3b1a4791f697..000000000000 --- a/comms/conserver/files/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -SUBDIR= autologin conserver.cf conserver console - -.include <bsd.subdir.mk> diff --git a/comms/conserver/files/conserver.in b/comms/conserver/files/conserver.in deleted file mode 100644 index 0cc210e94f2e..000000000000 --- a/comms/conserver/files/conserver.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -# PROVIDE: conserver -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# To enable conserver, add lines like below to /etc/rc.conf. -# -# conserver_enable="YES" - -conserver_enable=${conserver_enable:-"no"} - -. /etc/rc.subr - -name=conserver -rcvar=conserver_enable - -command=%%PREFIX%%/sbin/conserver -conserver_configfile=${conserver_configfile:-"%%PREFIX%%/etc/conserver.cf"} -command_args="-d -n -C ${conserver_configfile}" -required_files=${conserver_configfile} - -load_rc_config $name - -case "$1" in -start) if [ -x ${command} -a -f ${configfile} ]; then - run_rc_command "$1" - fi - ;; -*) - run_rc_command "$1" - ;; -esac - -exit 0 diff --git a/comms/conserver/files/patch-autologin-Make.host b/comms/conserver/files/patch-autologin-Make.host deleted file mode 100644 index 0d87cf120ab1..000000000000 --- a/comms/conserver/files/patch-autologin-Make.host +++ /dev/null @@ -1,11 +0,0 @@ ---- etc/autologin/Make.host.orig Sat Nov 22 20:19:33 1997 -+++ etc/autologin/Make.host Tue Nov 21 18:07:15 2000 -@@ -11,7 +11,7 @@ - HOSTTYPE,`PARAGON',` - BINDIR= ${DESTDIR}/etc - ',` --BINDIR= ${DESTDIR}/usr/local/etc -+BINDIR= ${DESTDIR}${PREFIX}/sbin - ')` - - INCLUDE= diff --git a/comms/conserver/files/patch-conserver-Make.host b/comms/conserver/files/patch-conserver-Make.host deleted file mode 100644 index 064116961f18..000000000000 --- a/comms/conserver/files/patch-conserver-Make.host +++ /dev/null @@ -1,10 +0,0 @@ ---- etc/conserver/Make.host.orig Sat Nov 22 20:19:31 1997 -+++ etc/conserver/Make.host Tue Nov 21 18:11:42 2000 -@@ -10,2 +10,2 @@ --ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc --DOC= ${DESTDIR}/usr/local/man -+ETC= ${DESTDIR}/${PREFIX}/sbin -+DOC= ${DESTDIR}/${PREFIX}/man -@@ -36 +36 @@ --HOSTTYPE,`EPIX',` -systype bsd43')` -+HOSTTYPE,`EPIX',` -systype bsd43')` -DPORT=${DEFAULTPORT} diff --git a/comms/conserver/files/patch-console-Make.host b/comms/conserver/files/patch-console-Make.host deleted file mode 100644 index 1d2e690044c1..000000000000 --- a/comms/conserver/files/patch-console-Make.host +++ /dev/null @@ -1,10 +0,0 @@ ---- etc/console/Make.host.orig Sat Nov 22 20:19:33 1997 -+++ etc/console/Make.host Tue Nov 21 18:12:28 2000 -@@ -18,2 +18,2 @@ --ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc --DOC= ${DESTDIR}/usr/local/man -+ETC= ${DESTDIR}/${PREFIX}/bin -+DOC= ${DESTDIR}/${PREFIX}/man -@@ -34 +34 @@ --HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${SERVER}\" -+HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${DEFAULTHOST}\" -DPORT=${DEFAULTPORT} diff --git a/comms/conserver/files/patch-etc-autologin-autologin.c b/comms/conserver/files/patch-etc-autologin-autologin.c deleted file mode 100644 index e5109dcbcab8..000000000000 --- a/comms/conserver/files/patch-etc-autologin-autologin.c +++ /dev/null @@ -1,68 +0,0 @@ ---- etc/autologin/autologin.c.orig 2000-08-02 11:39:42.000000000 -0700 -+++ etc/autologin/autologin.c 2010-01-28 21:04:23.000000000 -0800 -@@ -23,7 +23,15 @@ - #include <pwd.h> - #include <grp.h> - #include <errno.h> -+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 -+#include <utmpx.h> -+#define utmp utmpx -+#define setutent setutxent -+#define getutent getutxent -+#define endutent endutxent -+#else - #include <utmp.h> -+#endif - - - #include "machine.h" -@@ -189,7 +197,12 @@ - (void)strncpy(utmp.ut_host, "(autologin)", sizeof(utmp.ut_host)); - #endif - #endif -+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 -+ utmp.ut_tv.tv_sec = time((time_t *) 0); -+ utmp.ut_tv.tv_usec = 0; -+#else - utmp.ut_time = time((time_t *) 0); -+#endif - - if (0 == iFound) { - fprintf(stderr, "%s: %s: no ttyslot\n", progname, pctty); -@@ -443,11 +456,36 @@ - /* NOTREACHED */ - } - #endif -+#ifdef __FreeBSD_version -+ /* XXX: FreeBSD does not support IUCLC, translate uppercase characters -+ to lowercase */ -+ n_tio.c_iflag &= ~(IGNCR); -+#else - n_tio.c_iflag &= ~(IGNCR|IUCLC); -+#endif - n_tio.c_iflag |= ICRNL|IXON|IXANY; -+#ifdef __FreeBSD_version -+ /* -+ XXX: FreeBSD does not support OLCUC, translater lowercase -+ to uppercase -+ XXX: FreeBSD does not support OFILL, use fill (padding) characters -+ instead of timing for delays -+ XXX: FreeBSD does not support NLDLY, newline delay (nlN) -+ XXX: FreeBSD does not support CRDLY, carrier return delay (crN) -+ XXX: FreeBSD does not support BSDLY, backspace dealy (bsN) -+ */ -+ n_tio.c_oflag &= ~(ONOCR|ONLRET|TABDLY); -+#else - n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY); -+#endif - n_tio.c_oflag |= OPOST|ONLCR|TAB3; -+#ifdef __FreeBSD_version -+ /* XXX: FreeBSD does not support XCASE, with icanon, escape with '\' -+ for uppercase characters */ -+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL); -+#else - n_tio.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL); -+#endif - n_tio.c_lflag |= ISIG|ICANON|ECHO; - n_tio.c_cc[VEOF] = '\004'; /* ^D */ - n_tio.c_cc[VEOL] = '\000'; /* EOL */ diff --git a/comms/conserver/files/patch-etc-autologin-machine.h b/comms/conserver/files/patch-etc-autologin-machine.h deleted file mode 100644 index 96e622d1cded..000000000000 --- a/comms/conserver/files/patch-etc-autologin-machine.h +++ /dev/null @@ -1,73 +0,0 @@ ---- etc/autologin/machine.h.orig 2000-08-02 11:39:42.000000000 -0700 -+++ etc/autologin/machine.h 2010-01-28 21:01:18.000000000 -0800 -@@ -1,7 +1,6 @@ - /* $Id: machine.h,v 2.8 1997/11/10 17:10:34 ksb Exp $ - * leverage in liew of L7 - */ -- - #if !defined(HPUX) && (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)) - #define HPUX 1 - #endif -@@ -17,11 +16,11 @@ - #endif - - #if !defined(USE_OLD_UTENT) --#define USE_OLD_UTENT (defined(SUN4)||defined(FREEBSD)||defined(NETBSD)||defined(S81)) -+#define USE_OLD_UTENT (defined(SUN4)||(defined(FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version < 900008)||defined(NETBSD)||defined(S81)) - #endif - - #if !defined(USE_UTENT) --#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX)) -+#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX)||(defined(__FreeBSD_version) && (__FreeBSD_version > 900007))) - #endif - - #if !defined(NEED_PUTENV) -@@ -38,7 +37,7 @@ - #define USE_TERMIO (defined(ETA10)||defined(V386)) - #endif - #if !defined(USE_TERMIOS) --#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX)) -+#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX)||(defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007))) - #endif - #if !defined(USE_TCBREAK) - #define USE_TCBREAK (defined(SUN4)||defined(PTX)) -@@ -66,7 +65,7 @@ - #endif - - #if !defined(USE_TC) --#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON)) -+#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON)||(defined(__FreeBSD_version) && (__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007)) - #endif - - #if !defined(HAVE_GETUSERATTR) -@@ -74,7 +73,7 @@ - #endif - - #if !defined(USE_IOCTL) --#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||defined(FREEBSD)) -+#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||(defined(FREEBSD)&&(defined(__FreeBSD_version) && (__FreeBSD_version < 800044 || (__FreeBSD_version >= 900000 &&__FreeBSD_version < 900008))))) - #endif - - -@@ -127,8 +126,11 @@ - #if FREEBSD - #include <sys/uio.h> - #include <sys/proc.h> -+#if defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007) -+#include <termios.h> -+#else - #include <sys/ioctl_compat.h> --#define setsid() getpid() -+#endif - #else - - #endif /* NETBSD */ -@@ -148,7 +150,7 @@ - #if HPUX - #define HAVE_GETSID (defined(HPUX10)||defined(LINUX)) - #else --#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX -+#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX || FREEBSD - #define HAVE_GETSID 1 - #else - #define HAVE_GETSID 0 diff --git a/comms/conserver/files/patch-etc_conserver_consent.c b/comms/conserver/files/patch-etc_conserver_consent.c deleted file mode 100644 index 632dd0464753..000000000000 --- a/comms/conserver/files/patch-etc_conserver_consent.c +++ /dev/null @@ -1,34 +0,0 @@ ---- etc/conserver/consent.c.orig Wed Nov 17 18:10:14 1999 -+++ etc/conserver/consent.c Wed Nov 17 18:12:57 1999 -@@ -295,7 +295,7 @@ - */ - termp.c_iflag = IXON|IXOFF|BRKINT; - termp.c_oflag = 0; -- termp.c_cflag = CREAD; -+ termp.c_cflag = CREAD | (termp.c_cflag & (CLOCAL|CRTSCTS)); - termp.c_cflag |= pCE->pparity->iset; - termp.c_lflag = 0; - /* -@@ -303,7 +303,7 @@ - * Set the VTIME == 1 (0.1 sec) - * Don't bother with the control characters as they are not used - */ -- termp.c_cc[VMIN] = 128; -+ termp.c_cc[VMIN] = 1; - termp.c_cc[VTIME] = 1; - - if (-1 == cfsetospeed(&termp,pCE->pbaud->irate)) { -@@ -563,11 +563,10 @@ - exit(1); - } - #endif -- n_tios.c_iflag &= ~(IGNCR|IUCLC); -+ n_tios.c_iflag &= ~(IGNCR); - n_tios.c_iflag |= ICRNL|IXON|IXANY; -- n_tios.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY); - n_tios.c_oflag |= OPOST|ONLCR; -- n_tios.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL); -+ n_tios.c_lflag &= ~(NOFLSH|ECHOK|ECHONL); - n_tios.c_lflag |= ISIG|ICANON|ECHO; - n_tios.c_cc[VEOF] = '\004'; - n_tios.c_cc[VEOL] = '\000'; diff --git a/comms/conserver/files/patch-etc_conserver_console.m b/comms/conserver/files/patch-etc_conserver_console.m deleted file mode 100644 index c85432d262c5..000000000000 --- a/comms/conserver/files/patch-etc_conserver_console.m +++ /dev/null @@ -1,57 +0,0 @@ ---- etc/console/console.m.orig 2000-08-02 11:39:42.000000000 -0700 -+++ etc/console/console.m 2007-09-12 09:30:56.000000000 -0700 -@@ -582,17 +582,17 @@ - return; - - #if USE_TERMIOS -- if (0 != ioctl(0, TCGETS, & o_tios)) { -+ if (0 != tcgetattr(0, & o_tios)) { - fprintf(stderr, "%s: iotcl: getsw: %s\n", progname, strerror(errno)); - exit(10); - } - n_tios = o_tios; -- n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON); -+ n_tios.c_iflag &= ~(INLCR|IGNCR|ICRNL|IXON); - n_tios.c_oflag &= ~OPOST; - n_tios.c_lflag &= ~(ICANON|ISIG|ECHO); - n_tios.c_cc[VMIN] = 1; - n_tios.c_cc[VTIME] = 0; -- if (0 != ioctl(0, TCSETS, & n_tios)) { -+ if (0 != tcsetattr(0, TCSANOW, & n_tios)) { - fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno)); - exit(10); - } -@@ -668,7 +668,7 @@ - if (!screwy) - return; - #if USE_TERMIOS -- (void)ioctl(0, TCSETS, (char *)&o_tios); -+ (void)tcsetattr(0, TCSANOW, &o_tios); - #else - #if USE_TERMIO - (void)ioctl(0, TCSETA, (char *)&o_tio); -@@ -693,7 +693,7 @@ - register int nr; - - while (0 != iLen) { -- if (-1 == (nr = write(fd, pcBuf, iLen))) { -+ if (0 >= (nr = write(fd, pcBuf, iLen))) { - c2cooked(); - fprintf(stderr, "%s: lost connection\n", progname); - exit(3); -@@ -980,6 +980,7 @@ - static int SawUrg = 0; - #if DO_POWER - static char acPowCtl[128]; -+static int Indir(); - - /* We take a moment to call the power controller and ask (ksb) - * them about the console line we were chatting with. We'll be right -@@ -991,7 +992,6 @@ - char *pcControl, *pcLine, *pcCurrent; - { - register char *pcAt; -- static int Indir(); - - if ((char *)0 != (pcAt = strchr(pcControl, '@'))) { - *pcAt++ = '\000'; diff --git a/comms/conserver/files/patch-etc_conserver_group.c_1 b/comms/conserver/files/patch-etc_conserver_group.c_1 deleted file mode 100644 index dc4a1bb3a2ef..000000000000 --- a/comms/conserver/files/patch-etc_conserver_group.c_1 +++ /dev/null @@ -1,31 +0,0 @@ ---- etc/conserver/group.c.orig Wed Nov 17 18:07:38 1999 -+++ etc/conserver/group.c Wed Nov 17 18:09:43 1999 -@@ -902,7 +902,7 @@ - #endif - #if USE_TERMIO - if (-1 == ioctl(pCEServing->fdtty, TCSBRK, (char *)0)) { -- CSTROUT(pCLServing->fd, "failed]\r\n"); -+ CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n"); - continue; - } - #else -@@ -1274,15 +1274,12 @@ - continue; - } - #if !defined(XTABS) /* XXX hack */ --#define XTABS TAB3 -+#define XTABS OXTABS - #endif -- if (XTABS == (TABDLY&sbuf.c_oflag)) { -- sbuf.c_oflag &= ~TABDLY; -- sbuf.c_oflag |= TAB0; -- } else { -- sbuf.c_oflag &= ~TABDLY; -+ if (XTABS & sbuf.c_oflag) -+ sbuf.c_oflag &= ~XTABS; -+ else - sbuf.c_oflag |= XTABS; -- } - if (-1 == tcsetattr(pCEServing->fdtty, TCSANOW, & sbuf)) { - CSTROUT(pCLServing->fd, "failed]\r\n"); - continue; diff --git a/comms/conserver/files/patch-etc_conserver_group.c_2 b/comms/conserver/files/patch-etc_conserver_group.c_2 deleted file mode 100644 index 75c5821c05bf..000000000000 --- a/comms/conserver/files/patch-etc_conserver_group.c_2 +++ /dev/null @@ -1,21 +0,0 @@ ---- etc/conserver/group.c.orig Thu Aug 3 03:39:42 2000 -+++ etc/conserver/group.c Sat Jul 7 16:10:53 2001 -@@ -228,6 +228,18 @@ - struct passwd *pwd; - char *pcEPass, *pcWord; - { -+ if (pcEPass && '#' == pcEPass[0] && '#' == pcEPass[1] && '\0' != pcEPass[2] && (MAXLOGNAME + 1) > strlen(pcEPass)) { -+ /* If the encrypted password field from the config file -+ * looks like ##USER, look up the password for that -+ * user for the match. -+ */ -+ pwd = getpwnam(pcEPass+2); -+ if ((struct passwd *) NULL == pwd) { -+ return 0; -+ } -+ pcEPass = (char *)0; -+ } -+ - if (pcEPass && '\0' != pcEPass[0]) - if (MD5CheckPass(pcEPass, pcWord)) - return 1; diff --git a/comms/conserver/files/patch-etc_conserver_master.c b/comms/conserver/files/patch-etc_conserver_master.c deleted file mode 100644 index 6c45ce8e02dc..000000000000 --- a/comms/conserver/files/patch-etc_conserver_master.c +++ /dev/null @@ -1,23 +0,0 @@ ---- etc/conserver/master.c.orig 2000-08-02 11:39:42.000000000 -0700 -+++ etc/conserver/master.c 2013-09-18 00:48:10.621087079 -0700 -@@ -200,17 +200,17 @@ - - if ((msfd=socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "%s: socket: %s\n", progname, strerror(errno)); -- return; -+ return 0; - } - #if defined(SO_REUSEADDR) && defined(SOL_SOCKET) - if (setsockopt(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&iTrue, sizeof(iTrue))<0) { - fprintf(stderr, "%s: setsockopt: %s\n", progname, strerror(errno)); -- return; -+ return 0; - } - #endif - if (bind(msfd, (struct sockaddr *)&master_port, sizeof(master_port))<0) { - fprintf(stderr, "%s: bind: %s\n", progname, strerror(errno)); -- return; -+ return 0; - } - if (listen(msfd, SOMAXCONN) < 0) { - fprintf(stderr, "%s: listen: %s\n", progname, strerror(errno)); diff --git a/comms/conserver/files/patch-group.h b/comms/conserver/files/patch-group.h deleted file mode 100644 index 868c538cfa47..000000000000 --- a/comms/conserver/files/patch-group.h +++ /dev/null @@ -1,5 +0,0 @@ ---- etc/conserver/group.h.orig Wed Aug 2 11:39:42 2000 -+++ etc/conserver/group.h Thu Nov 8 09:53:10 2001 -@@ -29 +29 @@ --#define MAXPSWDLEN 16 /* max length of encrypted password */ -+#define MAXPSWDLEN 64 /* max length of encrypted password */ diff --git a/comms/conserver/files/patch-machine.h b/comms/conserver/files/patch-machine.h deleted file mode 100644 index 973c6833dd25..000000000000 --- a/comms/conserver/files/patch-machine.h +++ /dev/null @@ -1,17 +0,0 @@ ---- etc/conserver/machine.h.orig Wed Aug 2 11:39:42 2000 -+++ etc/conserver/machine.h Thu Nov 23 03:45:25 2000 -@@ -85,3 +85,3 @@ - #if !defined(HAVE_UWAIT) --#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) -+#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) - #endif -@@ -137,3 +137,3 @@ - #if !defined(HAVE_SETSID) --#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) -+#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) - #endif -@@ -159,3 +159,3 @@ - #if !defined(USE_TERMIOS) --#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) -+#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) - #endif diff --git a/comms/conserver/files/patch-readcfg.c b/comms/conserver/files/patch-readcfg.c deleted file mode 100644 index 6128a75f581e..000000000000 --- a/comms/conserver/files/patch-readcfg.c +++ /dev/null @@ -1,12 +0,0 @@ ---- etc/conserver/readcfg.c.orig Wed Aug 2 19:39:42 2000 -+++ etc/conserver/readcfg.c Tue Jul 24 12:09:27 2001 -@@ -194,7 +194,7 @@ - if ('\000' != pGE->passwd[0] && 0 != strcmp(pcPass, pGE->passwd)) { - fprintf(stderr, "%s: %s(%d) group %d has more than one password, first taken\n", progname, pcFile, iLine, iG); - } else if ((int)strlen(pcPass) > MAXPSWDLEN) { -- fprintf(stderr, "%s: %s(%d) password too long (%d is the limit)\n", progname, pcFile, iLine, iG, MAXPSWDLEN); -+ fprintf(stderr, "%s: %s(%d) password too long (%d is the limit)\n", progname, pcFile, iLine, MAXPSWDLEN); - } else { - (void)strcpy(pGE->passwd, pcPass); - } - diff --git a/comms/conserver/pkg-descr b/comms/conserver/pkg-descr deleted file mode 100644 index d3137366f445..000000000000 --- a/comms/conserver/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -This program provides a convenient way to manage many remote serial -consoles for machines. A server (conserver(8)) runs on each server -machine and it connects to the specified serial port. It can log, -provide shared access to remote consoles, etc. If there are multiple -machines running conserver(8), a master conserver(8) can be run to -connect to all the slave servers, providing a single point of access -to the entire cluster. - -This is very handy for remote unattended FreeBSD servers. It can send -serial break signals which is useful for breaking into DDB on hung machines. - -WWW: http://www.conserver.com/ diff --git a/comms/conserver/pkg-plist b/comms/conserver/pkg-plist deleted file mode 100644 index 584be1d5da4a..000000000000 --- a/comms/conserver/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/console -etc/conserver.cf.eg -man/man5/conserver.cf.5.gz -man/man8/autologin.8.gz -man/man8/console.8.gz -man/man8/conserver.8.gz -sbin/autologin -sbin/conserver diff --git a/databases/Makefile b/databases/Makefile index 02fbb2080118..e9d9a7de5365 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -75,7 +75,6 @@ SUBDIR += fastdb SUBDIR += firebird25-client SUBDIR += firebird25-server - SUBDIR += flamerobin SUBDIR += fortytwo-bdb SUBDIR += foundationdb SUBDIR += fpc-dblib @@ -183,8 +182,6 @@ SUBDIR += mantis SUBDIR += mariadb-connector-c SUBDIR += mariadb-connector-odbc - SUBDIR += mariadb100-client - SUBDIR += mariadb100-server SUBDIR += mariadb101-client SUBDIR += mariadb101-server SUBDIR += mariadb102-client diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile deleted file mode 100644 index 0b29599f9f0d..000000000000 --- a/databases/flamerobin/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: dindin -# $FreeBSD$ - -PORTNAME= flamerobin -PORTVERSION= 0.9.2 -PORTREVISION= 6 -CATEGORIES= databases -MASTER_SITES= SF -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= ports@FreeBSD.org -COMMENT= GUI administration tool for firebird database - -DEPRECATED= Abandonware since 2009, does not work with newer version of wxGTK -EXPIRATION_DATE= 2019-03-24 - -LICENSE= expat -LICENSE_NAME= FlameRobin Expat -LICENSE_FILE= ${WRKSRC}/docs/fr_license.html -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -USES= compiler firebird -GNU_CONFIGURE= yes -USE_WX= 2.8 -WX_COMPS= wx contrib -WX_CONF_ARGS= absolute -WX_PREMK= yes - -SUB_FILES= pkg-message - -.include <bsd.port.pre.mk> - -# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html -.if ${COMPILER_TYPE} == gcc -CONFIGURE_ARGS= --disable-precomp-headers -.endif - -.include <bsd.port.post.mk> diff --git a/databases/flamerobin/distinfo b/databases/flamerobin/distinfo deleted file mode 100644 index 490a6a0b2cf4..000000000000 --- a/databases/flamerobin/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (flamerobin-0.9.2-src.tar.gz) = b674a1de1c632c834e904a17e576498850e7b81cc5c4d42e8cafd8a6dd020c90 -SIZE (flamerobin-0.9.2-src.tar.gz) = 901908 diff --git a/databases/flamerobin/files/patch-clang-git-03e89f b/databases/flamerobin/files/patch-clang-git-03e89f deleted file mode 100644 index 82af967e254c..000000000000 --- a/databases/flamerobin/files/patch-clang-git-03e89f +++ /dev/null @@ -1,337 +0,0 @@ ---- src/gui/controls/DBHTreeControl.cpp -+++ src/gui/controls/DBHTreeControl.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -261,6 +261,8 @@ - id = ART_View; break; - case ntViews: - id = ART_Views; break; -+ default: -+ break; - } - return getImageIndex(id); - } ---- src/gui/CreateIndexDialog.cpp -+++ src/gui/CreateIndexDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -209,6 +209,7 @@ - class TableIndicesHandler: public URIHandler - { - public: -+ TableIndicesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/gui/ExecuteSqlFrame.cpp -+++ src/gui/ExecuteSqlFrame.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -2749,6 +2749,7 @@ - class DropColumnHandler: public URIHandler - { - public: -+ DropColumnHandler() {}; - bool handleURI(URI& uri); - private: - static const DropColumnHandler handlerInstance; -@@ -2806,6 +2807,7 @@ - class DropColumnsHandler: public URIHandler - { - public: -+ DropColumnsHandler() {}; - bool handleURI(URI& uri); - private: - static const DropColumnsHandler handlerInstance; -@@ -2842,6 +2844,7 @@ - class DropObjectHandler: public URIHandler - { - public: -+ DropObjectHandler() {}; - bool handleURI(URI& uri); - private: - static const DropObjectHandler handlerInstance; -@@ -2878,6 +2881,7 @@ - class EditDDLHandler: public URIHandler - { - public: -+ EditDDLHandler() {}; - bool handleURI(URI& uri); - private: - static const EditDDLHandler handlerInstance; -@@ -2919,6 +2923,7 @@ - class EditProcedureHandler: public URIHandler - { - public: -+ EditProcedureHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2947,6 +2952,7 @@ - class AlterViewHandler: public URIHandler - { - public: -+ AlterViewHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2973,6 +2979,7 @@ - class EditTriggerHandler: public URIHandler - { - public: -+ EditTriggerHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2999,6 +3006,7 @@ - class EditGeneratorValueHandler: public URIHandler - { - public: -+ EditGeneratorValueHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3041,6 +3049,7 @@ - class EditExceptionHandler: public URIHandler - { - public: -+ EditExceptionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3067,6 +3076,7 @@ - class IndexActionHandler: public URIHandler - { - public: -+ IndexActionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3113,6 +3123,7 @@ - class ActivateTriggersHandler: public URIHandler - { - public: -+ ActivateTriggersHandler() {}; - bool handleURI(URI& uri); - private: - static const ActivateTriggersHandler handlerInstance; -@@ -3160,6 +3171,7 @@ - class ActivateTriggerHandler: public URIHandler - { - public: -+ ActivateTriggerHandler() {}; - bool handleURI(URI& uri); - private: - static const ActivateTriggerHandler handlerInstance; ---- src/gui/FieldPropertiesDialog.cpp -+++ src/gui/FieldPropertiesDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -816,6 +816,7 @@ - class ColumnPropertiesHandler: public URIHandler - { - public: -+ ColumnPropertiesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/gui/MetadataItemPropertiesFrame.cpp -+++ src/gui/MetadataItemPropertiesFrame.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -360,6 +360,8 @@ - case ntDatabase: - case ntRole: - pages.push_back(wxT("DDL")); -+ default: -+ break; - }; - wxString page = loadEntireFile(config().getHtmlTemplatesPath() - + wxT("header.html")); -@@ -1290,6 +1292,7 @@ - class PageHandler: public URIHandler - { - public: -+ PageHandler() {}; - bool handleURI(URI& uri); - private: - static const PageHandler handlerInstance; // singleton; registers itself on creation. -@@ -1327,6 +1330,7 @@ - class PropertiesHandler: public URIHandler - { - public: -+ PropertiesHandler() {}; - bool handleURI(URI& uri); - private: - static const PropertiesHandler handlerInstance; // singleton; registers itself on creation. ---- src/gui/PrivilegesDialog.cpp -+++ src/gui/PrivilegesDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -583,6 +583,7 @@ - class ManagePrivilegesHandler: public URIHandler - { - public: -+ ManagePrivilegesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/gui/ReorderFieldsDialog.cpp -+++ src/gui/ReorderFieldsDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -215,6 +215,7 @@ - class ReorderFieldsHandler: public URIHandler - { - public: -+ ReorderFieldsHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/gui/TriggerWizardDialog.cpp -+++ src/gui/TriggerWizardDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -178,6 +178,7 @@ - class CreateTriggerHandler: public URIHandler - { - public: -+ CreateTriggerHandler() {}; - bool handleURI(URI& uri); - private: - static const CreateTriggerHandler handlerInstance; ---- src/gui/UserDialog.cpp -+++ src/gui/UserDialog.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -222,6 +222,7 @@ - class UserPropertiesHandler: public URIHandler - { - public: -+ UserPropertiesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -300,6 +301,7 @@ - class DropUserHandler: public URIHandler - { - public: -+ DropUserHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/addconstrainthandler.cpp -+++ src/addconstrainthandler.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -51,6 +51,8 @@ - class AddConstraintHandler: public URIHandler - { - public: -+ AddConstraintHandler() {}; -+ - bool handleURI(URI& uri); - private: - static const AddConstraintHandler handlerInstance; // singleton; registers itself on creation. ---- src/databasehandler.cpp -+++ src/databasehandler.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -46,6 +46,7 @@ - class DatabaseInfoHandler: public URIHandler - { - public: -+ DatabaseInfoHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. ---- src/images.cpp -+++ src/images.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -68,6 +68,8 @@ - return wxArtProvider::GetIcon(ART_Trigger, wxART_OTHER, sz); - case ntView: - return wxArtProvider::GetIcon(ART_View, wxART_OTHER, sz); -+ default: -+ break; - } - return wxArtProvider::GetIcon(ART_FlameRobin, wxART_OTHER, sz); - } ---- src/objectdescriptionhandler.cpp -+++ src/objectdescriptionhandler.cpp -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -46,6 +46,7 @@ - class ObjectDescriptionHandler: public URIHandler - { - public: -+ ObjectDescriptionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. diff --git a/databases/flamerobin/files/patch-configure b/databases/flamerobin/files/patch-configure deleted file mode 100644 index 3eb574c21e61..000000000000 --- a/databases/flamerobin/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.orig 2008-10-22 09:36:24.000000000 +0000 -+++ configure -@@ -7361,6 +7361,7 @@ EOF - ;; - - powerpc-apple-macos* | \ -+ *-*-dragonfly* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ - *-*-mirbsd* | \ - *-*-sunos4* | \ -@@ -7404,6 +7405,7 @@ echo "$as_me: error: unknown system type - SONAME_FLAG= - - case "${BAKEFILE_HOST}" in -+ *-*-dragonfly | \ - *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ - *-*-k*bsd*-gnu | *-*-mirbsd* ) - if test "x$SUNCXX" = "xyes"; then diff --git a/databases/flamerobin/files/pkg-message.in b/databases/flamerobin/files/pkg-message.in deleted file mode 100644 index 95198980a4c8..000000000000 --- a/databases/flamerobin/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -############################################################################### - -FlameRobin was installed - -For additonal documentation read manpage flamerobin(1) and docs in -%%PREFIX%%/share/flamerobin/docs/ . Also you can view same docs from -flamerobin's help menu. - -############################################################################### diff --git a/databases/flamerobin/pkg-descr b/databases/flamerobin/pkg-descr deleted file mode 100644 index 137cc118c25e..000000000000 --- a/databases/flamerobin/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Nice and very useful firebird database administration -tool with many features. - -WWW: http://www.flamerobin.org/ diff --git a/databases/flamerobin/pkg-plist b/databases/flamerobin/pkg-plist deleted file mode 100644 index 68cf2cd4070b..000000000000 --- a/databases/flamerobin/pkg-plist +++ /dev/null @@ -1,40 +0,0 @@ -bin/flamerobin -man/man1/flamerobin.1.gz -%%DATADIR%%/conf-defs/db_settings.confdef -%%DATADIR%%/conf-defs/fr_settings.confdef -%%DATADIR%%/docs/fr_license.html -%%DATADIR%%/docs/fr_manual.html -%%DATADIR%%/docs/fr_whatsnew.html -%%DATADIR%%/docs/html.css -%%DATADIR%%/html-templates/ALLloading.html -%%DATADIR%%/html-templates/DATABASE.html -%%DATADIR%%/html-templates/DATABASEtriggers.html -%%DATADIR%%/html-templates/DDL.html -%%DATADIR%%/html-templates/DOMAIN.html -%%DATADIR%%/html-templates/EXCEPTION.html -%%DATADIR%%/html-templates/FUNCTION.html -%%DATADIR%%/html-templates/GENERATOR.html -%%DATADIR%%/html-templates/PROCEDURE.html -%%DATADIR%%/html-templates/PROCEDUREprivileges.html -%%DATADIR%%/html-templates/ROLE.html -%%DATADIR%%/html-templates/ROLEprivileges.html -%%DATADIR%%/html-templates/SERVER.html -%%DATADIR%%/html-templates/TABLE.html -%%DATADIR%%/html-templates/TABLEconstraints.html -%%DATADIR%%/html-templates/TABLEindices.html -%%DATADIR%%/html-templates/TABLEprivileges.html -%%DATADIR%%/html-templates/TABLEtriggers.html -%%DATADIR%%/html-templates/TRIGGER.html -%%DATADIR%%/html-templates/VIEW.html -%%DATADIR%%/html-templates/VIEWprivileges.html -%%DATADIR%%/html-templates/VIEWtriggers.html -%%DATADIR%%/html-templates/compute.png -%%DATADIR%%/html-templates/dependencies.html -%%DATADIR%%/html-templates/drop.png -%%DATADIR%%/html-templates/header.html -%%DATADIR%%/html-templates/ok.png -%%DATADIR%%/html-templates/ok2.png -%%DATADIR%%/html-templates/redx.png -%%DATADIR%%/html-templates/view.png -share/applications/flamerobin.desktop -share/pixmaps/flamerobin.png diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile deleted file mode 100644 index 8243894f69a1..000000000000 --- a/databases/mariadb100-client/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PKGNAMESUFFIX= 100-client - -COMMENT= Multithreaded SQL database (client) - -LICENSE+= LGPL21 - -MASTERDIR= ${.CURDIR}/../mariadb100-server - -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CMAKE_ARGS+= -DWITHOUT_SERVER=1 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -CLIENT_ONLY= yes - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 - ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb100-client/files/patch-CMakeLists.txt b/databases/mariadb100-client/files/patch-CMakeLists.txt deleted file mode 100644 index 707584ed11dd..000000000000 --- a/databases/mariadb100-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 -+++ CMakeLists.txt 2017-05-23 20:47:01.403482000 +0200 -@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(libservices) - ADD_SUBDIRECTORY(scripts) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) -@@ -425,6 +425,7 @@ IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(internal) - ENDIF() - ENDIF() -+ENDIF() - - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -480,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) - - # MDEV-6526 these files are not installed anymore -@@ -489,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb100-client/files/patch-client_CMakeLists.txt b/databases/mariadb100-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 34a11073dc6d..000000000000 --- a/databases/mariadb100-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-01-29 18:39:34 UTC -+++ client/CMakeLists.txt -@@ -39,12 +39,13 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ENDIF() - -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) --TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) -+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) - SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -81,10 +86,12 @@ IF(WIN32) - ENDIF(WIN32) - - # async_example is just a code example, do not install it. -+IF(FALSE) - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example mysqlclient) -+ENDIF() - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-client/files/patch-cmake_ssl.cmake b/databases/mariadb100-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0414d663f59c..000000000000 --- a/databases/mariadb100-client/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/ssl.cmake.orig 2016-08-24 15:07:34 UTC -+++ cmake/ssl.cmake -@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL) - MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") - ENDIF() - -- # On mac this list is <.dylib;.so;.a> -- # We prefer static libraries, so we revert it here. -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") - FIND_LIBRARY(OPENSSL_LIBRARIES - NAMES ssl ssleay32 ssleay32MD -@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL) - FIND_LIBRARY(CRYPTO_LIBRARY - NAMES crypto libeay32 - HINTS ${OPENSSL_ROOT_DIR}/lib) -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARIES AND diff --git a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 63e2e96f9bb6..000000000000 --- a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ extra/CMakeLists.txt -@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -74,9 +75,12 @@ ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -@@ -100,7 +104,9 @@ ENDIF() - ../storage/innobase/page/page0zip.cc - ) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) -+ENDIF() - diff --git a/databases/mariadb100-client/files/patch-include_CMakeLists.txt b/databases/mariadb100-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index db795a5a93ce..000000000000 --- a/databases/mariadb100-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ include/CMakeLists.txt -@@ -66,16 +66,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I - FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - ENDFOREACH(f) --INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") -+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "psi_abi*" EXCLUDE -+) - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() - - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb100-client/files/patch-include_my__compare.h b/databases/mariadb100-client/files/patch-include_my__compare.h deleted file mode 100644 index 788176ec99c7..000000000000 --- a/databases/mariadb100-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2017-01-12 01:45:16 UTC -+++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 69c35e1aecc6..000000000000 --- a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ libmysql/CMakeLists.txt -@@ -479,6 +479,8 @@ IF(NOT DISABLE_SHARED) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") -+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") -+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") - ELSE() diff --git a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 3d519797d81f..000000000000 --- a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ libservices/CMakeLists.txt -@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES - logger_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb100-client/files/patch-man_CMakeLists.txt b/databases/mariadb100-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 32274e8bf45a..000000000000 --- a/databases/mariadb100-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- man/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ man/CMakeLists.txt -@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) - SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1) - -+IF(FALSE) - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+ENDIF() - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) -+IF(FALSE) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -+ENDIF() - diff --git a/databases/mariadb100-client/files/patch-mysys_my__default.c b/databases/mariadb100-client/files/patch-mysys_my__default.c deleted file mode 100644 index 70ab3073cf64..000000000000 --- a/databases/mariadb100-client/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC -+++ mysys/my_default.c -@@ -786,7 +786,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -804,6 +804,14 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1229,13 +1238,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index 1c7f87d89399..000000000000 --- a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2017-01-12 01:45:18 UTC -+++ pcre/CMakeLists.txt -@@ -509,6 +509,8 @@ IF(PCRE_SHOW_REPORT) - MESSAGE(STATUS "") - ENDIF(PCRE_SHOW_REPORT) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) -+ENDIF() - - # end CMakeLists.txt diff --git a/databases/mariadb100-client/files/patch-scripts_mysql__config.sh b/databases/mariadb100-client/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 4254a0cf9b24..000000000000 --- a/databases/mariadb100-client/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 UTC -+++ scripts/mysql_config.sh -@@ -109,8 +109,11 @@ fi - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC diff --git a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt deleted file mode 100644 index 5e9fa44d640d..000000000000 --- a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC -+++ sql/CMakeLists.txt -@@ -247,9 +247,9 @@ RUN_BISON( - ) - - # Gen_lex_hash --IF(NOT CMAKE_CROSSCOMPILING) -+ - ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) --ENDIF() -+ - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h diff --git a/databases/mariadb100-client/files/pkg-message.in b/databases/mariadb100-client/files/pkg-message.in deleted file mode 100644 index 8bea32f83491..000000000000 --- a/databases/mariadb100-client/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ -************************************************************************ - -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. - -************************************************************************ diff --git a/databases/mariadb100-client/pkg-plist b/databases/mariadb100-client/pkg-plist deleted file mode 100644 index ba56d5f41131..000000000000 --- a/databases/mariadb100-client/pkg-plist +++ /dev/null @@ -1,113 +0,0 @@ -bin/msql2mysql -bin/mysql -bin/mysql_config -bin/mysql_find_rows -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -include/mysql/auth_dialog_client.h -include/mysql/big_endian.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.h -include/mysql/byte_order_generic_x86_64.h -include/mysql/client_plugin.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/handler_ername.h -include/mysql/handler_state.h -include/mysql/keycache.h -include/mysql/little_endian.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/ma_dyncol.h -include/mysql/my_alloc.h -include/mysql/my_attribute.h -include/mysql/my_byteorder.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_decimal_limits.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_valgrind.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_com_server.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h -include/mysql/plugin.h -include/mysql/plugin_audit.h -include/mysql/plugin_auth.h -include/mysql/plugin_auth_common.h -include/mysql/plugin_ftparser.h -include/mysql/psi/mysql_file.h -include/mysql/psi/mysql_idle.h -include/mysql/psi/mysql_socket.h -include/mysql/psi/mysql_stage.h -include/mysql/psi/mysql_statement.h -include/mysql/psi/mysql_table.h -include/mysql/psi/mysql_thread.h -include/mysql/psi/psi.h -include/mysql/service_debug_sync.h -include/mysql/service_kill_statement.h -include/mysql/service_logger.h -include/mysql/service_my_plugin_log.h -include/mysql/service_my_snprintf.h -include/mysql/service_progress_report.h -include/mysql/service_sha1.h -include/mysql/service_thd_alloc.h -include/mysql/service_thd_autoinc.h -include/mysql/service_thd_error_context.h -include/mysql/service_thd_timezone.h -include/mysql/service_thd_wait.h -include/mysql/services.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.18 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.18 -man/man1/msql2mysql.1.gz -man/man1/mysql.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_find_rows.1.gz -man/man1/mysql_plugin.1.gz -man/man1/mysql_waitpid.1.gz -man/man1/mysqlaccess.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.1.gz -man/man1/mysqlcheck.1.gz -man/man1/mysqldump.1.gz -man/man1/mysqlimport.1.gz -man/man1/mysqlshow.1.gz -man/man1/mysqlslap.1.gz -@comment bin/mytop -@comment %%DATADIR%%/SELinux/mariadb.te -@comment %%DATADIR%%/SELinux/rhel4-mysql.fc -@comment %%DATADIR%%/SELinux/rhel4-mysql.te -@comment %%DATADIR%%/binary-configure -@comment %%DATADIR%%/magic -@comment %%DATADIR%%/mysql-log-rotate -@comment %%DATADIR%%/mysql.server -@comment %%DATADIR%%/mysqld_multi.server diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile deleted file mode 100644 index 50fcc5dba9c1..000000000000 --- a/databases/mariadb100-server/Makefile +++ /dev/null @@ -1,188 +0,0 @@ -# $FreeBSD$ - -PORTNAME?= mariadb -PORTVERSION= 10.0.38 -PORTREVISION?= 0 -CATEGORIES= databases ipv6 -MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ - http://mirrors.supportex.net/${SITESDIR}/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ - http://gd.tuwien.ac.at/db/${SITESDIR}/ \ - http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ - http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ - http://mirror.layerjet.com/${SITESDIR}/ \ - http://mirror.switch.ch/mirror/${SITESDIR}/ -PKGNAMESUFFIX?= 100-server - -MAINTAINER= brnrd@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) - -DEPRECATED= Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) -EXPIRATION_DATE= 2019-04-01 - -LICENSE= GPLv2 -LICENSE_NAME_PerconaFT= PerconaFT patents license -LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS -LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -SUB_FILES= pkg-message - -SLAVEDIRS= databases/mariadb100-client -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe \ - ncurses shebangfix ssl -USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin -SHEBANG_FILES= scripts/*.sh -SITESDIR= mariadb/mariadb-${PORTVERSION}/source - -OPTIONS_DEFINE= FASTMTX -NO_OPTIONS_SORT= yes - -FASTMTX_DESC= Replace mutexes with spinlocks - -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ - -DINSTALL_DOCREADMEDIR="share/doc/mariadb" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="man" \ - -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR= \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SQLBENCHDIR= \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_UNIT_TESTS=0 \ - -DWITH_SSL=${OPENSSLBASE} \ - -DWITH_LIBWRAP=1 \ - -DCOMPILATION_COMMENT="FreeBSD Ports" - -DATADIR= ${PREFIX}/share/mysql - -.ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. -.endif - -CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - -.if !defined(CLIENT_ONLY) -# MySQL-Server options -OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS -OPTIONS_DEFAULT+= MAXKEY -OPTIONS_GROUP= ENGINES -OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB - -CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine -ENGINES_DESC= Optional MariaDB storage engines -INNOBASE_DESC= Build InnoDB engine next to XtraDB -MAXKEY_DESC= Change max key length from 1000 to 4000 -MROONGA_DESC= Mroonga Full Text Search engine -OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) -SPHINX_DESC= SphinxSE engine -SPIDER_DESC= Partitioning and XA-transactions engine -TOKUDB_DESC= Fractal tree index tree data structure engine - -OPTIONS_SUB= yes - -.endif - -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 - -.if defined(CLIENT_ONLY) -# MySQL-Client part -USES+= readline -.else -# MySQL-Server part -BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory -USES+= mysql:100m -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -USE_RC_SUBR= mysql-server -USERS= mysql -GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 - -.for ENGINE in ${OPTIONS_GROUP_ENGINES} -${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 -.endfor - -CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC -CONNECT_EXTRA_USE= gnome=libxml2 -MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h -MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 -MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 -OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libJudy.so:devel/judy -TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_PORTDOCS= PATENTS README.md -TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi - -post-install: - # Remove programs to avoid conflict with mariadb100-client - # These are "client" components, so there should be a switch that - # prevents them from being installed but it's unknown right now -. for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ - bin/mysqlaccess share/aclocal/mysql.m4 - ${RM} ${STAGEDIR}${PREFIX}/${f} -. endfor - ${RM} -r ${STAGEDIR}${DATADIR}/SELinux - -post-install-TOKUDB-on: - ${RM} ${STAGEDIR}${DOCSDIR}/COPYING.GPLv2 \ - ${STAGEDIR}${DOCSDIR}/COPYING.AGPLv3 -.endif - -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD -CMAKE_ARGS+= -DWITH_JEMALLOC="system" -.else -CMAKE_ARGS+= -DWITH_JEMALLOC="no" -.endif - -.if ${PORT_OPTIONS:MTOKUDB} -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ - https://github.com/percona/PerconaFT/blob/master/README.md -.endif - -.if ${ARCH} == 'i386' -# Server segfaults on i386 when built with clang >= 3.4 -USE_GCC= yes -.endif - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh -.if ${OPSYS} == DragonFly - ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ - ${WRKSRC}/cmake/os/DragonFly.cmake - ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb -.endif - -# This file is being generated incorrectly for unknown reasons. -# See https://bugs.freebsd.org/230839 for details. -post-configure: - ${REINPLACE_CMD} -e 's|-l-pthread|-pthread|g' ${WRKSRC}/scripts/mysql_config - -post-configure-MROONGA-on: - ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ - ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt - -.include <bsd.port.post.mk> diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo deleted file mode 100644 index c753642b9c37..000000000000 --- a/databases/mariadb100-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1549017629 -SHA256 (mariadb-10.0.38.tar.gz) = 022620ebeb4fb3744d101e72443ec55b4585e7d9a3d8c92aa846bc30e6808ac1 -SIZE (mariadb-10.0.38.tar.gz) = 64755921 diff --git a/databases/mariadb100-server/files/extra-patch-include_my__compare.h b/databases/mariadb100-server/files/extra-patch-include_my__compare.h deleted file mode 100644 index 5fc447b98cd7..000000000000 --- a/databases/mariadb100-server/files/extra-patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 -+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 -@@ -40,7 +40,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb100-server/files/mysql-server.in b/databases/mariadb100-server/files/mysql-server.in deleted file mode 100644 index d3417eebce5f..000000000000 --- a/databases/mariadb100-server/files/mysql-server.in +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ -# -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_(instance_)?enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` -%%LEGACY_LIMITS%%# just before mysql starts. -# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_(instance_)?args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_(instance_)?pidfile (str): Custum PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_(instance_)?user (str): User to run mysqld as -# Default to "mysql" created by the port -# mysql_(instance_)?optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} -: ${mysql_user="mysql"} -%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" -%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" -%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" - eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" - eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" - ;; - *) - err 1 "$2 not found in mysql_instances" ;; - esac -else - if [ -n "${mysql_instances}" -a -n "$1" ]; then - for instance in ${mysql_instances}; do - eval _enable="\${mysql_${instance}_enable}" - case "${_enable:-${mysql_enable}}" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - continue - ;; - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - ;; - *) - if [ -z "$_enable" ]; then - _var=mysql_enable - else - _var=mysql_${instance}_enable - fi - warn "Bad value" \ - "'${_enable:-${mysql_enable}}'" \ - "for ${_var}. " \ - "Instance ${instance} skipped." - continue - ;; - esac - echo "===> mysql instance: ${instance}" - if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then - success="${instance} ${success}" - else - failed="${instance} (${retcode}) ${failed}" - fi - done - exit 0 - else - mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} - fi -fi - -pidfile=$mysql_pidfile -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args - [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} -} - -mysql_prestart() -{ - local dir - for dir in /etc /etc/mysql; do - if [ -f "${dir}/my.cnf" ]; then - echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" - return 1 - fi - done - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi -%%LEGACY_LIMITS%% if checkyesno mysql_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt deleted file mode 100644 index 124415c4f146..000000000000 --- a/databases/mariadb100-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ ---- CMakeLists.txt.orig 2018-01-27 18:40:35 UTC -+++ CMakeLists.txt -@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) -@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) - - # MDEV-6526 these files are not installed anymore -@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb100-server/files/patch-client_CMakeLists.txt b/databases/mariadb100-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index ad9967fb338b..000000000000 --- a/databases/mariadb100-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,70 +0,0 @@ ---- client/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ client/CMakeLists.txt -@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( - COPY_OPENSSL_DLLS(copy_openssl_client) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc - ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -37,6 +38,7 @@ IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli - - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - -@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl - MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) - SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) -+ENDIF() - - # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". - IF(WIN32) - MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) - ENDIF(WIN32) - -+IF(FALSE) - # async_example is just a code example, do not install it. - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example mysqlclient) -+ENDIF() - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-server/files/patch-cmake_ssl.cmake b/databases/mariadb100-server/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0414d663f59c..000000000000 --- a/databases/mariadb100-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/ssl.cmake.orig 2016-08-24 15:07:34 UTC -+++ cmake/ssl.cmake -@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL) - MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") - ENDIF() - -- # On mac this list is <.dylib;.so;.a> -- # We prefer static libraries, so we revert it here. -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") - FIND_LIBRARY(OPENSSL_LIBRARIES - NAMES ssl ssleay32 ssleay32MD -@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL) - FIND_LIBRARY(CRYPTO_LIBRARY - NAMES crypto libeay32 - HINTS ${OPENSSL_ROOT_DIR}/lib) -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARIES AND diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index aa0a7143e460..000000000000 --- a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ extra/CMakeLists.txt -@@ -78,8 +78,10 @@ IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) diff --git a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index 1301365656fc..000000000000 --- a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2015-06-17 14:54:11 UTC -+++ extra/yassl/taocrypt/src/integer.cpp -@@ -74,7 +74,7 @@ template <class T> - CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( - size_type n, const void *) - { -- if (n > this->max_size()) -+ if (n > AlignedAllocator<T>::max_size()) - return 0; - if (n == 0) - return 0; diff --git a/databases/mariadb100-server/files/patch-include_CMakeLists.txt b/databases/mariadb100-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index 388e12c58666..000000000000 --- a/databases/mariadb100-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- include/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ include/CMakeLists.txt -@@ -62,17 +62,21 @@ SET(HEADERS - handler_ername.h - ) - -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - ENDFOREACH(f) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") -+ENDIF() - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index a692fdfec2f0..000000000000 --- a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ libmysql/CMakeLists.txt -@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy - - # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) - - # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -418,6 +418,7 @@ IF(MSVC) - INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) - ENDIF() - -+IF(FALSE) - IF(UNIX) - MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) - SET(DOT_VERSION ".${VERSION}") -@@ -432,11 +433,13 @@ IF(UNIX) - ENDMACRO() - INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) - ENDIF() -+ENDIF() - - IF(NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) - ENDFOREACH() - ENDIF() - ENDIF() -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 1cb3f24acbeb..000000000000 --- a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ libservices/CMakeLists.txt -@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES - logger_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-man_CMakeLists.txt b/databases/mariadb100-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 852c5b63cd5c..000000000000 --- a/databases/mariadb100-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ man/CMakeLists.txt -@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys - - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+IF(FALSE) - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -- -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-mysys_my__default.c b/databases/mariadb100-server/files/patch-mysys_my__default.c deleted file mode 100644 index 70ab3073cf64..000000000000 --- a/databases/mariadb100-server/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC -+++ mysys/my_default.c -@@ -786,7 +786,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -804,6 +804,14 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1229,13 +1238,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb100-server/files/patch-mysys_stacktrace.c b/databases/mariadb100-server/files/patch-mysys_stacktrace.c deleted file mode 100644 index 93d636d4cdce..000000000000 --- a/databases/mariadb100-server/files/patch-mysys_stacktrace.c +++ /dev/null @@ -1,48 +0,0 @@ -https://jira.mariadb.org/browse/MDEV-15961 - ---- mysys/stacktrace.c.orig 2018-01-27 18:40:37 UTC -+++ mysys/stacktrace.c -@@ -34,19 +34,19 @@ - #include <execinfo.h> - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#ifdef HAVE_BSS_START - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - void my_init_stacktrace() - { --#ifdef HAVE_BSS_START -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - } - - #ifdef __linux__ -@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad - - int my_safe_print_str(const char* val, int max_len) - { -+#ifdef __linux__ - char *heap_end; - --#ifdef __linux__ - // Try and make use of /proc filesystem to safely print memory contents. - if (!safe_print_str(val, max_len)) - return 0; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { diff --git a/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 deleted file mode 100644 index 05083cd206ac..000000000000 --- a/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 +++ /dev/null @@ -1,40 +0,0 @@ ---- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.cc -@@ -27,7 +27,7 @@ - /* - Currently the only active code that can return error is: - judy_bitset::reset()/J1U() -- judy_bitset::setbit()/J1S() -+ judy_bitset::jsetbit()/J1S() - - In most cases errors are either about wrong parameters passed to Judy - functions or internal structures corruption. These definitely deserve -@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ - return rc == 1; - } - --open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) -+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) - { - int rc; - J1S(rc, array, n); ---- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.h -@@ -63,7 +63,7 @@ namespace open_query - if (!val) - return reset(n); - else -- return setbit(n); -+ return jsetbit(n); - } - - judy_bitset& set(const judy_bitset& src); -@@ -115,7 +115,7 @@ namespace open_query - private: - mutable void* array; - -- judy_bitset& setbit(size_type n); -+ judy_bitset& jsetbit(size_type n); - }; - } - diff --git a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index a292081845ba..000000000000 --- a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ pcre/CMakeLists.txt -@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) - MESSAGE(STATUS "") - ENDIF(PCRE_SHOW_REPORT) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) -+ENDIF() - - # end CMakeLists.txt diff --git a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index b7a5a3912ba6..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ scripts/CMakeLists.txt -@@ -269,6 +269,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() diff --git a/databases/mariadb100-server/files/patch-scripts_mysql__config.sh b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index bbf559927e05..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2015-06-17 14:54:12 UTC -+++ scripts/mysql_config.sh -@@ -109,8 +109,11 @@ fi - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh deleted file mode 100644 index d6f1dcede44d..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC -+++ scripts/mysqld_safe.sh -@@ -469,10 +469,10 @@ fi - - if test -z "$MYSQL_HOME" - then -- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" -+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" - then - log_error "WARNING: Found two instances of my.cnf - --$MY_BASEDIR_VERSION/my.cnf and -+$MY_BASEDIR_VERSION/etc/my.cnf and - $DATADIR/my.cnf - IGNORING $DATADIR/my.cnf" - -@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf" - then - log_error "WARNING: Found $DATADIR/my.cnf - The data directory is a deprecated location for my.cnf, please move it to --$MY_BASEDIR_VERSION/my.cnf" -+$MY_BASEDIR_VERSION/etc/my.cnf" - unsafe_my_cnf=1 - MYSQL_HOME=$DATADIR - else diff --git a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index 8f2defac77f8..000000000000 --- a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- sql/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ sql/CMakeLists.txt -@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean - VERBATIM - ) - -+IF(FALSE) - IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - - # Copy db.opt into data/test/ -@@ -355,6 +356,7 @@ ELSE() - INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) - ENDIF(WIN32 AND MYSQLD_EXECUTABLE) - ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") -+ENDIF() - - IF(WIN32) - SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -397,8 +399,10 @@ IF(WIN32) - TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) - ENDIF(WIN32) - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN examples EXCLUDE - PATTERN share EXCLUDE - PATTERN CMakeFiles EXCLUDE) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-sql_sql__trigger.cc b/databases/mariadb100-server/files/patch-sql_sql__trigger.cc deleted file mode 100644 index 91fdcac66e75..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sql__trigger.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- sql/sql_trigger.cc.orig 2015-06-17 14:54:12 UTC -+++ sql/sql_trigger.cc -@@ -192,32 +192,32 @@ static File_option triggers_file_paramet - { - { - { C_STRING_WITH_LEN("triggers") }, -- my_offsetof(class Table_triggers_list, definitions_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }, - { - { C_STRING_WITH_LEN("definers") }, -- my_offsetof(class Table_triggers_list, definers_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("client_cs_names") }, -- my_offsetof(class Table_triggers_list, client_cs_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("connection_cl_names") }, -- my_offsetof(class Table_triggers_list, connection_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("db_cl_names") }, -- my_offsetof(class Table_triggers_list, db_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), - FILE_OPTIONS_STRLIST - }, - { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -226,7 +226,7 @@ static File_option triggers_file_paramet - File_option sql_modes_parameters= - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - diff --git a/databases/mariadb100-server/files/patch-sql_sql__view.cc b/databases/mariadb100-server/files/patch-sql_sql__view.cc deleted file mode 100644 index f723c208a05a..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sql__view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2015-06-17 14:54:12 UTC -+++ sql/sql_view.cc -@@ -716,46 +716,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_VIEW_ALGO}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast<int>(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("mariadb-version")}, - my_offsetof(TABLE_LIST, mariadb_version), diff --git a/databases/mariadb100-server/files/patch-sql_sys__vars.cc b/databases/mariadb100-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index 58721ac6b568..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2015-06-17 14:54:13 UTC -+++ sql/sys_vars.cc -@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulonglong Sys_join_buffer_size( - "join_buffer_size", -@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( diff --git a/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp b/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp deleted file mode 100644 index de409349f3e6..000000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/connect/tabmysql.cpp.orig 2017-03-06 20:04:37 UTC -+++ storage/connect/tabmysql.cpp -@@ -335,7 +335,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCST - Delayed = !!GetIntCatInfo("Delayed", 0); - } else { - // MYSQL access from a PROXY table -- Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, "*")); -+ Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, (PSZ)"*")); - Isview = GetBoolCatInfo("View", false); - - // We must get other connection parms from the calling table diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt deleted file mode 100644 index cd1f2a84bea8..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/tokudb/CMakeLists.txt.orig 2016-02-17 20:59:56 UTC -+++ storage/tokudb/CMakeLists.txt -@@ -131,8 +131,8 @@ SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb") - SET(TOKUDB_SOURCES ha_tokudb.cc) - MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) --SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") --SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE}") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}") - - SET(CPACK_RPM_server_PACKAGE_OBSOLETES - "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake deleted file mode 100644 index 7fe07d8427d2..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake -@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) - endif () - check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) - if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) -- set(CMAKE_REQUIRED_LIBRARIES execinfo) -- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) -- if (HAVE_BACKTRACE_WITH_EXECINFO) -- list(APPEND EXTRA_SYSTEM_LIBS execinfo) -- else () -- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") -- endif () -+ list(APPEND EXTRA_SYSTEM_LIBS execinfo) - endif () - - if(HAVE_CLOCK_REALTIME) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake deleted file mode 100644 index bce1fd09db6f..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake +++ /dev/null @@ -1,37 +0,0 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-02-17 20:59:56 UTC -+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/include") -+ -+ add_library(lzma SHARED IMPORTED) -+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION -+ "/usr/lib/liblzma.so") -+ELSE() - ## add lzma with an external project - set(xz_configure_opts --with-pic --enable-static) - if (APPLE) -@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) - set_target_properties(lzma PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") - add_dependencies(lzma build_lzma) -+ENDIF() - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/local/include") - -+ add_library(snappy SHARED IMPORTED) -+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION -+ "/usr/local/lib/libsnappy.so") -+ELSE() - ## add snappy with an external project - set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") - if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") -@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) - set_target_properties(snappy PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") - add_dependencies(snappy build_snappy) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt deleted file mode 100644 index d0a809928ae0..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2017-01-12 01:45:22 UTC -+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt -@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI - maybe_add_gcov_to_libraries(ft ft_static) - - ## depend on other generated targets --add_dependencies(ft install_tdb_h generate_log_code build_lzma build_snappy) --add_dependencies(ft_static install_tdb_h generate_log_code build_lzma build_snappy) -+add_dependencies(ft install_tdb_h generate_log_code) -+add_dependencies(ft_static install_tdb_h generate_log_code) - - ## link with lzma (which should be static) and link dependers with zlib - target_link_libraries(ft LINK_PRIVATE util_static lzma snappy ${LIBTOKUPORTABILITY}) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc deleted file mode 100644 index 61187db8b0c8..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/PerconaFT/portability/memory.cc -@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: - #include <string.h> - #include <stdio.h> - #include <stdlib.h> --#if defined(HAVE_MALLOC_H) --# include <malloc.h> --#elif defined(HAVE_SYS_MALLOC_H) --# include <sys/malloc.h> --#endif - #include <dlfcn.h> - #include <toku_race_tools.h> - #include "memory.h" diff --git a/databases/mariadb100-server/files/pkg-message.in b/databases/mariadb100-server/files/pkg-message.in deleted file mode 100644 index b49d42074149..000000000000 --- a/databases/mariadb100-server/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -************************************************************************ - -Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) -the first time you start the MySQL server after an upgrade from an -earlier version. - -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. - -This port does NOT include the mytop perl script, this is included in -the MariaDB tarball but the most recent version can be found in the -databases/mytop port - -************************************************************************ diff --git a/databases/mariadb100-server/pkg-descr b/databases/mariadb100-server/pkg-descr deleted file mode 100644 index 31c3ca1ce897..000000000000 --- a/databases/mariadb100-server/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -MariaDB is a database server that offers drop-in replacement functionality -for MySQL. MariaDB is built by some of the original authors of MySQL, with -assistance from the broader community of Free and open source software -developers. In addition to the core functionality of MySQL, MariaDB offers -a rich set of feature enhancements including alternate storage engines, -server optimizations, and patches. - -MariaDB is primarily driven by developers at Monty Program, a company -founded by Michael "Monty" Widenius, the original author of MySQL, but -this is not the whole story about MariaDB. On the "About MariaDB" page you -will find more information about all participants in the MariaDB community, -including storage engines XtraDB and PBXT. - -WWW: http://mariadb.org/ diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist deleted file mode 100644 index f355616e1f5a..000000000000 --- a/databases/mariadb100-server/pkg-plist +++ /dev/null @@ -1,236 +0,0 @@ -bin/aria_chk -bin/aria_dump_log -bin/aria_ftdump -bin/aria_pack -bin/aria_read_log -bin/innochecksum -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql_client_test_embedded -bin/mysql_convert_table_format -bin/mysql_embedded -bin/mysql_fix_extensions -bin/mysql_install_db -bin/mysql_plugin -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -bin/mysql_zap -bin/mysqlbug -bin/mysqld_multi -bin/mysqld_safe -bin/mysqld_safe_helper -bin/mysqldumpslow -bin/mysqlhotcopy -bin/mysqltest -bin/mysqltest_embedded -@comment bin/mytop -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -%%TOKUDB%%bin/tokuft_logprint -%%TOKUDB%%bin/tokuftdump -include/mysql/private/atomic/gcc_builtins.h -include/mysql/private/atomic/generic-msvc.h -include/mysql/private/atomic/nolock.h -include/mysql/private/atomic/rwlock.h -include/mysql/private/atomic/solaris.h -include/mysql/private/atomic/x86-gcc.h -include/mysql/private/base64.h -include/mysql/private/config.h -include/mysql/private/embedded_priv.h -include/mysql/private/ft_global.h -include/mysql/private/hash.h -include/mysql/private/heap.h -include/mysql/private/lf.h -include/mysql/private/maria.h -include/mysql/private/my_aes.h -include/mysql/private/my_alarm.h -include/mysql/private/my_atomic.h -include/mysql/private/my_base.h -include/mysql/private/my_bit.h -include/mysql/private/my_bitmap.h -include/mysql/private/my_check_opt.h -include/mysql/private/my_compare.h -include/mysql/private/my_context.h -include/mysql/private/my_cpu.h -include/mysql/private/my_default.h -include/mysql/private/my_handler_errors.h -include/mysql/private/my_libwrap.h -include/mysql/private/my_md5.h -include/mysql/private/my_nosys.h -include/mysql/private/my_rdtsc.h -include/mysql/private/my_rnd.h -include/mysql/private/my_stacktrace.h -include/mysql/private/my_time.h -include/mysql/private/my_tree.h -include/mysql/private/my_uctype.h -include/mysql/private/my_user.h -include/mysql/private/myisam.h -include/mysql/private/myisamchk.h -include/mysql/private/myisammrg.h -include/mysql/private/myisampack.h -include/mysql/private/mysql_async.h -include/mysql/private/mysqld_default_groups.h -include/mysql/private/mysys_err.h -include/mysql/private/password.h -include/mysql/private/probes_mysql.h -include/mysql/private/probes_mysql_nodtrace.h -include/mysql/private/queues.h -include/mysql/private/rijndael.h -include/mysql/private/service_versions.h -include/mysql/private/sha1.h -include/mysql/private/sha2.h -include/mysql/private/t_ctype.h -include/mysql/private/thr_alarm.h -include/mysql/private/thr_lock.h -include/mysql/private/thread_pool_priv.h -include/mysql/private/violite.h -include/mysql/private/waiting_threads.h -include/mysql/private/welcome_copyright_notice.h -include/mysql/private/wqueue.h -lib/mysql/libmysqld.a -lib/mysql/libmysqld.so -lib/mysql/libmysqld.so.18 -lib/mysql/plugin/adt_null.so -lib/mysql/plugin/auth_0x0100.so -lib/mysql/plugin/auth_pam.so -lib/mysql/plugin/auth_socket.so -lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/dialog_examples.so -lib/mysql/plugin/feedback.so -lib/mysql/plugin/ha_archive.so -lib/mysql/plugin/ha_blackhole.so -lib/mysql/plugin/ha_connect.so -lib/mysql/plugin/ha_federated.so -lib/mysql/plugin/ha_federatedx.so -%%INNOBASE%%lib/mysql/plugin/ha_innodb.so -%%MROONGA%%lib/mysql/plugin/ha_mroonga.so -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so -lib/mysql/plugin/ha_sequence.so -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so -%%SPIDER%%lib/mysql/plugin/ha_spider.so -%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so -lib/mysql/plugin/ha_test_sql_discovery.so -lib/mysql/plugin/handlersocket.so -lib/mysql/plugin/libdaemon_example.so -lib/mysql/plugin/locales.so -lib/mysql/plugin/metadata_lock_info.so -lib/mysql/plugin/mypluglib.so -lib/mysql/plugin/mysql_clear_password.so -lib/mysql/plugin/qa_auth_client.so -lib/mysql/plugin/qa_auth_interface.so -lib/mysql/plugin/qa_auth_server.so -lib/mysql/plugin/query_cache_info.so -lib/mysql/plugin/query_response_time.so -lib/mysql/plugin/semisync_master.so -lib/mysql/plugin/semisync_slave.so -lib/mysql/plugin/server_audit.so -lib/mysql/plugin/sql_errlog.so -libexec/mysqld -man/man1/aria_chk.1.gz -man/man1/aria_dump_log.1.gz -man/man1/aria_ftdump.1.gz -man/man1/aria_pack.1.gz -man/man1/aria_read_log.1.gz -man/man1/innochecksum.1.gz -man/man1/my_print_defaults.1.gz -man/man1/myisam_ftdump.1.gz -man/man1/myisamchk.1.gz -man/man1/myisamlog.1.gz -man/man1/myisampack.1.gz -man/man1/mysql.server.1.gz -man/man1/mysql_convert_table_format.1.gz -man/man1/mysql_fix_extensions.1.gz -man/man1/mysql_install_db.1.gz -man/man1/mysql_secure_installation.1.gz -man/man1/mysql_setpermission.1.gz -man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_upgrade.1.gz -man/man1/mysql_zap.1.gz -man/man1/mysqlbug.1.gz -man/man1/mysqld_multi.1.gz -man/man1/mysqld_safe.1.gz -man/man1/mysqldumpslow.1.gz -man/man1/mysqlhotcopy.1.gz -man/man1/mysqltest.1.gz -man/man1/perror.1.gz -man/man1/replace.1.gz -man/man1/resolve_stack_dump.1.gz -man/man1/resolveip.1.gz -man/man8/mysqld.8.gz -%%DATADIR%%/binary-configure -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/fill_help_tables.sql -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/install_spider.sql -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/magic -%%MROONGA%%%%DATADIR%%/mroonga/install.sql -%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql -%%DATADIR%%/my-huge.cnf -%%DATADIR%%/my-innodb-heavy-4G.cnf -%%DATADIR%%/my-large.cnf -%%DATADIR%%/my-medium.cnf -%%DATADIR%%/my-small.cnf -%%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql.server -%%DATADIR%%/mysql_performance_tables.sql -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys diff --git a/devel/Makefile b/devel/Makefile index 69f141ab0011..7effdddf7eb8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4109,7 +4109,6 @@ SUBDIR += phpunit6 SUBDIR += phpunit7 SUBDIR += physfs - SUBDIR += physfs-devel SUBDIR += picp SUBDIR += picprog SUBDIR += pig @@ -4477,7 +4476,6 @@ SUBDIR += py-confusable_homoglyphs SUBDIR += py-constantly SUBDIR += py-construct - SUBDIR += py-construct28 SUBDIR += py-contextlib2 SUBDIR += py-cookiecutter SUBDIR += py-coreapi @@ -6393,8 +6391,6 @@ SUBDIR += xtl SUBDIR += xtl-quant-stack SUBDIR += xtoolchain-llvm-devel - SUBDIR += xtoolchain-llvm40 - SUBDIR += xtoolchain-llvm50 SUBDIR += xtoolchain-llvm60 SUBDIR += xtoolchain-llvm70 SUBDIR += xtoolchain-llvm80 diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile deleted file mode 100644 index e6e52abe16ff..000000000000 --- a/devel/physfs-devel/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Oliver Lehmann <oliver@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= physfs -PORTVERSION= 3.0.1 -PORTREVISION= 1 -CATEGORIES= devel -MASTER_SITES= http://icculus.org/${PORTNAME}/downloads/ -PKGNAMESUFFIX= -devel - -MAINTAINER= oliver@FreeBSD.org -COMMENT= Library to provide abstract access to various archives - -CONFLICTS_INSTALL= physfs-[0-9]* - -IGNORE= use devel/physfs -DEPRECATED= is the same as devel/physfs, serving no purpose -EXPIRATION_DATE=2019-03-12 - -USES= cmake:insource readline tar:bzip2 -USE_LDCONFIG= yes - -.include <bsd.port.mk> diff --git a/devel/physfs-devel/distinfo b/devel/physfs-devel/distinfo deleted file mode 100644 index d6308d04f546..000000000000 --- a/devel/physfs-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1535226407 -SHA256 (physfs-3.0.1.tar.bz2) = b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1 -SIZE (physfs-3.0.1.tar.bz2) = 194638 diff --git a/devel/physfs-devel/pkg-descr b/devel/physfs-devel/pkg-descr deleted file mode 100644 index c1e07bc80f7d..000000000000 --- a/devel/physfs-devel/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -PhysicsFS is a library to provide abstract access to various archives. -It is intended for use in video games, and the design was somewhat -inspired by Quake 3's file subsystem. The programmer defines a "write -directory" on the physical filesystem. No file writing done through the -PhysicsFS API can leave that write directory, for security. For example, -an embedded scripting language cannot write outside of this path if it -uses PhysFS for all of its I/O, which means that untrusted scripts can -run more safely. Symbolic links can be disabled as well, for added -safety. For file reading, the programmer lists directories and archives -that form a "search path". Once the search path is defined, it becomes -a single, transparent hierarchical filesystem. This makes for easy -access to ZIP files in the same way as you access a file directly on the -disk, and it makes it easy to ship a new archive that will override a -previous archive on a per-file basis. Finally, PhysicsFS gives you -platform-abstracted means to determine if CD-ROMs are available, the -user's home directory, where in the real filesystem your program is -running, etc. - -WWW: http://icculus.org/physfs/ diff --git a/devel/physfs-devel/pkg-plist b/devel/physfs-devel/pkg-plist deleted file mode 100644 index e49a72ebb7ef..000000000000 --- a/devel/physfs-devel/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/test_physfs -include/physfs.h -lib/libphysfs.so.1 -lib/libphysfs.so.3.0.1 -lib/libphysfs.a -lib/libphysfs.so -libdata/pkgconfig/physfs.pc diff --git a/devel/py-construct28/Makefile b/devel/py-construct28/Makefile deleted file mode 100644 index 4c811ff72d0a..000000000000 --- a/devel/py-construct28/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Piotr Florczyk <p.florczyk@adminworkshop.pl> -# $FreeBSD$ - -PORTNAME= construct -PORTVERSION= 2.8.11 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 28 - -MAINTAINER= shaun@FreeBSD.org -COMMENT= Python module for parsing and building of data structures - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Latest upstream version is in ports tree devel/py-construct -EXPIRATION_DATE=2019-03-20 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} - -USES= python -USE_PYTHON= distutils autoplist - -NO_ARCH= yes - -.include <bsd.port.mk> diff --git a/devel/py-construct28/distinfo b/devel/py-construct28/distinfo deleted file mode 100644 index 7e0276cc1eb5..000000000000 --- a/devel/py-construct28/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1491960566 -SHA256 (construct-2.8.11.tar.gz) = 4d59bdef0209678c54805120dff03a0423d88989018eaa559e713ecb13ab6eb1 -SIZE (construct-2.8.11.tar.gz) = 719949 diff --git a/devel/py-construct28/pkg-descr b/devel/py-construct28/pkg-descr deleted file mode 100644 index a889fd2a112e..000000000000 --- a/devel/py-construct28/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Construct is a python library for parsing and building of data -structures (binary or textual). - -It is based on the concept of defining data structures in a declarative -manner, rather than procedural code: more complex constructs are -composed of a hierarchy of simpler ones. - -WWW: https://github.com/construct/construct diff --git a/devel/xtoolchain-llvm40/Makefile b/devel/xtoolchain-llvm40/Makefile deleted file mode 100644 index c1e55d42a968..000000000000 --- a/devel/xtoolchain-llvm40/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -LLVM_SUFFIX=40 - -DEPRECATED= No supported release uses this version -EXPIRATION_DATE= 2019-03-31 - -MASTERDIR= ${.CURDIR}/../xtoolchain-llvm-devel - -.include "${MASTERDIR}/Makefile" diff --git a/devel/xtoolchain-llvm50/Makefile b/devel/xtoolchain-llvm50/Makefile deleted file mode 100644 index 9673f8e6f723..000000000000 --- a/devel/xtoolchain-llvm50/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -LLVM_SUFFIX=50 - -DEPRECATED= No supported release uses this version -EXPIRATION_DATE= 2019-03-31 - -MASTERDIR= ${.CURDIR}/../xtoolchain-llvm-devel - -.include "${MASTERDIR}/Makefile" diff --git a/finance/Makefile b/finance/Makefile index a7701b0abb4f..ffe03cbd2fd2 100644 --- a/finance/Makefile +++ b/finance/Makefile @@ -22,7 +22,6 @@ SUBDIR += R-cran-vars SUBDIR += alkimia SUBDIR += aqbanking - SUBDIR += aqmoney SUBDIR += beancount SUBDIR += beanie SUBDIR += cbb @@ -47,7 +46,6 @@ SUBDIR += moneymanagerex SUBDIR += mybudget SUBDIR += myphpmoney - SUBDIR += openhbci SUBDIR += p5-Business-CreditCard SUBDIR += p5-Business-MaxMind-CreditCardFraudDetection SUBDIR += p5-Business-OCV diff --git a/finance/aqmoney/Makefile b/finance/aqmoney/Makefile deleted file mode 100644 index d4ac1fb10bff..000000000000 --- a/finance/aqmoney/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: Heiner Strauss <heiner@bilch.com> -# $FreeBSD$ - -PORTNAME= aqmoney -PORTVERSION= 0.6.3 -CATEGORIES= finance -MASTER_SITES= SF - -MAINTAINER= ports@FreeBSD.org -COMMENT= Manage your credit institute accounts using openhbci - -BROKEN= fails to build -DEPRECATED= no longer maintained upstream -EXPIRATION_DATE= 2019-03-31 - -LIB_DEPENDS= libopenhbci.so:finance/openhbci - -GNU_CONFIGURE= yes -PLIST_FILES= bin/aqmoney \ - man/man1/aqmoney.1.gz - -post-patch: - ${FIND} ${WRKSRC}/src -name "*.cpp" -o -name "*.h" | ${XARGS} \ - ${REINPLACE_CMD} -e 's|class HBCI::SimpleConfig;|namespace HBCI{class SimpleConfig;}|' - -.include <bsd.port.mk> diff --git a/finance/aqmoney/distinfo b/finance/aqmoney/distinfo deleted file mode 100644 index ce68e83c6b42..000000000000 --- a/finance/aqmoney/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (aqmoney-0.6.3.tar.gz) = ee4ac68a02b5e64508ae3987930c090e8583d72760206290bf95a9dcb0a82388 -SIZE (aqmoney-0.6.3.tar.gz) = 420834 diff --git a/finance/aqmoney/pkg-descr b/finance/aqmoney/pkg-descr deleted file mode 100644 index e88667cec208..000000000000 --- a/finance/aqmoney/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Aqmoney is a homebanking application. -Aqmoney is able to create both RDH mode ("security disc" mode called in -other programs) and DDV mode (chip card) customers. A customer is one who -has one or more account(s) at a credit institute. To manage accounts you must -first create a customer. - -WWW: https://sourceforge.net/projects/aqmoney/ diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile deleted file mode 100644 index d777e679536e..000000000000 --- a/finance/openhbci/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: Heiner Strauss <heiner@bilch.com> -# $FreeBSD$ - -PORTNAME= openhbci -PORTVERSION= 0.9.17.2 -PORTREVISION= 1 -CATEGORIES= finance -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9.17 -DISTNAME= openhbci-0.9.17-2 - -MAINTAINER= ports@FreeBSD.org -COMMENT= HBCI is a bank-independent homebanking standard - -DEPRECATED= no longer maintained upstream -EXPIRATION_DATE= 2019-03-31 - -USES= libtool ssl -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -CONFIGURE_ARGS+=--with-openssl-includes=${OPENSSLINC} \ - --with-openssl-libs=${OPENSSLLIB} - -WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.17 - -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= error: incomplete definition of type 'struct ssl_cipher_st' -BROKEN_FreeBSD_13= error: incomplete definition of type 'struct ssl_cipher_st' -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|-lstdc++||' \ - ${WRKSRC}/configure \ - ${WRKSRC}/src/openhbci/Makefile.in \ - ${WRKSRC}/src/openhbci/core/Makefile.in - -.include <bsd.port.post.mk> diff --git a/finance/openhbci/distinfo b/finance/openhbci/distinfo deleted file mode 100644 index 2314448cad5f..000000000000 --- a/finance/openhbci/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (openhbci-0.9.17-2.tar.gz) = 6031a42ec0c37eaa867e2a20a93fca97cf7dfe95d20bacd2b670c2f274fbe271 -SIZE (openhbci-0.9.17-2.tar.gz) = 736175 diff --git a/finance/openhbci/files/patch-configure b/finance/openhbci/files/patch-configure deleted file mode 100644 index 0b19eb0d1918..000000000000 --- a/finance/openhbci/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Sat Aug 21 06:41:37 2004 -+++ configure Tue May 17 15:19:54 2005 -@@ -20034,7 +20034,7 @@ - echo "$as_me:$LINENO: checking if plugin loading is supported" >&5 - echo $ECHO_N "checking if plugin loading is supported... $ECHO_C" >&6 - case `basename $CC` in -- gcc*) -+ gcc* | cc*) - gccversion=`$CC --version` - case $gccversion in - 0.*) diff --git a/finance/openhbci/files/patch-pointer.h b/finance/openhbci/files/patch-pointer.h deleted file mode 100644 index b869049d9ad4..000000000000 --- a/finance/openhbci/files/patch-pointer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openhbci/core/pointer.h~ 2003-07-01 22:04:04.000000000 +0200 -+++ src/openhbci/core/pointer.h 2011-12-20 19:35:02.781176123 +0100 -@@ -758,7 +758,7 @@ - "Bad cast", - u.description()); - /* otherwise create a new pointer */ -- return makePointer(u); -+ return PointerCast::makePointer(u); - }; - - }; diff --git a/finance/openhbci/files/patch-src__openhbci__core__date.cpp b/finance/openhbci/files/patch-src__openhbci__core__date.cpp deleted file mode 100644 index 0ed68130d883..000000000000 --- a/finance/openhbci/files/patch-src__openhbci__core__date.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openhbci/core/date.cpp.orig 2003-04-25 05:45:54.000000000 +0400 -+++ src/openhbci/core/date.cpp 2014-07-03 13:48:43.000000000 +0400 -@@ -43,6 +43,8 @@ - #include "date.h" - #include "hbcistring.h" - -+#include <stdlib.h> // for atoi() -+ - - namespace HBCI { - diff --git a/finance/openhbci/files/patch-src__openhbci__core__statusreport.cpp b/finance/openhbci/files/patch-src__openhbci__core__statusreport.cpp deleted file mode 100644 index 687984acbf8f..000000000000 --- a/finance/openhbci/files/patch-src__openhbci__core__statusreport.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/openhbci/core/statusreport.cpp.orig 2003-05-21 16:01:41.000000000 +0400 -+++ src/openhbci/core/statusreport.cpp 2014-07-03 13:52:40.000000000 +0400 -@@ -29,6 +29,7 @@ - #include "statusreport.h" - #include "hbcistring.h" - #include <assert.h> -+#include <stdlib.h> // for atoi() - - namespace HBCI { - diff --git a/finance/openhbci/files/patch-src__openhbci__core__updjob.cpp b/finance/openhbci/files/patch-src__openhbci__core__updjob.cpp deleted file mode 100644 index 8da09acdff32..000000000000 --- a/finance/openhbci/files/patch-src__openhbci__core__updjob.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/openhbci/core/updjob.cpp.orig 2003-01-31 22:13:29.000000000 +0300 -+++ src/openhbci/core/updjob.cpp 2014-07-03 13:52:04.000000000 +0400 -@@ -43,6 +43,7 @@ - - #include "updjob.h" - #include "hbcistring.h" -+#include <stdlib.h> // for atoi() - - - namespace HBCI { diff --git a/finance/openhbci/files/patch-src__openhbci__simpleconfig.cpp b/finance/openhbci/files/patch-src__openhbci__simpleconfig.cpp deleted file mode 100644 index 2b4abd016098..000000000000 --- a/finance/openhbci/files/patch-src__openhbci__simpleconfig.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/openhbci/simpleconfig.cpp.orig 2003-07-02 22:22:24.000000000 +0400 -+++ src/openhbci/simpleconfig.cpp 2014-07-03 13:53:03.000000000 +0400 -@@ -37,6 +37,7 @@ - #include "simpleconfig.h" - - #include <stdio.h> -+#include <stdlib.h> // for atoi() - #include "parser.h" - #include "filestream.h" - diff --git a/finance/openhbci/files/patch-src_openhbci_api.cpp b/finance/openhbci/files/patch-src_openhbci_api.cpp deleted file mode 100644 index 2c67f7fe888d..000000000000 --- a/finance/openhbci/files/patch-src_openhbci_api.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openhbci/api.cpp.orig 2018-09-01 02:43:47 UTC -+++ src/openhbci/api.cpp -@@ -1260,7 +1260,7 @@ void API::_addPluginsFromDirs(Pointer<MediumPluginList - goon=false; - else { - if (-1!=parser::cmpPattern(entry, -- "*"PLUGIN_EXT, -+ "*" PLUGIN_EXT, - false)) { - Pointer<MediumPluginFile> mpf; - diff --git a/finance/openhbci/files/patch-src_openhbci_core_bank.cpp b/finance/openhbci/files/patch-src_openhbci_core_bank.cpp deleted file mode 100644 index 9bab25cf7c4b..000000000000 --- a/finance/openhbci/files/patch-src_openhbci_core_bank.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openhbci/core/bank.cpp.orig 2003-04-25 01:45:54 UTC -+++ src/openhbci/core/bank.cpp -@@ -39,7 +39,7 @@ instituteMessage::instituteMessage() - instituteMessage::~instituteMessage(){ - } - --const bool instituteMessage::operator==(const instituteMessage &msg) { -+bool instituteMessage::operator==(const instituteMessage &msg) const { - return (_date == msg._date && - 0 == _time.compare(msg._time) && - _subject == msg._subject && diff --git a/finance/openhbci/files/patch-src_openhbci_core_bank.h b/finance/openhbci/files/patch-src_openhbci_core_bank.h deleted file mode 100644 index c05bc6276bd0..000000000000 --- a/finance/openhbci/files/patch-src_openhbci_core_bank.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openhbci/core/bank.h.orig 2003-06-13 21:50:00 UTC -+++ src/openhbci/core/bank.h -@@ -97,7 +97,7 @@ public: - instituteMessage(); - ~instituteMessage(); - -- const bool operator==(const instituteMessage &msg); -+ bool operator==(const instituteMessage &msg) const; - - /** Returns the Date of arrival. */ - const Date &date() const { return _date;}; diff --git a/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp b/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp deleted file mode 100644 index 714b264d285e..000000000000 --- a/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp +++ /dev/null @@ -1,80 +0,0 @@ ---- src/openhbci/core/deskey.cpp.orig 2002-12-10 15:54:07 UTC -+++ src/openhbci/core/deskey.cpp -@@ -42,11 +42,11 @@ - namespace HBCI { - - DESKey::DESKey(string password) { -- des_cblock left, right; -+ DES_cblock left, right; - keyData = ""; - - // transform password to 2 keys -- des_string_to_2keys(password.c_str(), &left, &right); -+ DES_string_to_2keys(password.c_str(), &left, &right); - - // set the keydata - for (int i=0; i<8; i++) -@@ -64,8 +64,8 @@ DESKey::~DESKey(){ - - DESKey DESKey::createKey() { - int result = 1; -- des_cblock nativeDESKey; -- des_key_schedule key; -+ DES_cblock nativeDESKey; -+ DES_key_schedule key; - - DESKey *newKey = new DESKey(); - newKey->keyData = ""; -@@ -73,16 +73,16 @@ DESKey DESKey::createKey() { - RAND_seed(getRndData(1024), 1024); - - while (result != 0) { -- des_random_key(&nativeDESKey); -- result = des_set_key_checked(&nativeDESKey, key); -+ DES_random_key(&nativeDESKey); -+ result = DES_set_key_checked(&nativeDESKey, &key); - } - for (int i=0; i<8; i++) - newKey->keyData += nativeDESKey[i]; - - result = 1; - while (result != 0) { -- des_random_key(&nativeDESKey); -- result = des_set_key_checked(&nativeDESKey, key); -+ DES_random_key(&nativeDESKey); -+ result = DES_set_key_checked(&nativeDESKey, &key); - } - for (int i=0; i<8; i++) - newKey->keyData += nativeDESKey[i]; -@@ -116,24 +116,24 @@ bool DESKey::crypt(int enDeCrypt) { - //2-key-tripple-des - //dataToCrypt.length() % 8 has to be 0, padding/ depadding in calling method - -- des_cblock left, right; -+ DES_cblock left, right; - keyData.copy((char*) &left,8); - keyData.copy((char*) &right,8,8); - -- des_cblock initVector; -- des_key_schedule key1, key2; -+ DES_cblock initVector; -+ DES_key_schedule key1, key2; - unsigned char source[intData.length()]; - unsigned char dest[intData.length()]; - for (unsigned int i=0; i<intData.length(); i++) - source[i]=intData[i]; - -- des_set_key(&left, key1); -- des_set_key(&right, key2); -+ DES_set_key(&left, &key1); -+ DES_set_key(&right, &key2); - for (int i=0; i<8; i++) - initVector[i] = 0; - -- des_ede2_cbc_encrypt((unsigned char*) &source, (unsigned char*) &dest, intData.length(), -- key1, key2, &initVector, enDeCrypt); -+ DES_ede2_cbc_encrypt((unsigned char*) &source, (unsigned char*) &dest, intData.length(), -+ &key1, &key2, &initVector, enDeCrypt); - - intData = string((const char*) &dest, intData.length()); - diff --git a/finance/openhbci/files/patch-src_openhbci_core_value.cpp b/finance/openhbci/files/patch-src_openhbci_core_value.cpp deleted file mode 100644 index bac63df180b2..000000000000 --- a/finance/openhbci/files/patch-src_openhbci_core_value.cpp +++ /dev/null @@ -1,16 +0,0 @@ -value.cpp:145:10: error: no viable conversion from 'std::__1::basic_istream<char>' to 'bool' - bool readsuccess = (ist >> _value); - ^ ~~~~~~~~~~~~~~~ - ---- src/openhbci/core/value.cpp.orig 2018-09-01 02:40:24 UTC -+++ src/openhbci/core/value.cpp -@@ -142,7 +142,8 @@ Value::Value(const string &strvalue) - setlocale(LC_NUMERIC, "C"); - - // Read float (double) value according to C-locale rules. -- bool readsuccess = (ist >> _value); -+ ist >> _value; -+ bool readsuccess = ist.good(); - - // Reset locale to cached string. - setlocale(LC_NUMERIC, oldloc.c_str()); diff --git a/finance/openhbci/files/patch-src_plugins_keyfile_keyfile.cpp b/finance/openhbci/files/patch-src_plugins_keyfile_keyfile.cpp deleted file mode 100644 index e96e467c7499..000000000000 --- a/finance/openhbci/files/patch-src_plugins_keyfile_keyfile.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/keyfile/keyfile.cpp.orig 2018-09-01 02:44:43 UTC -+++ src/plugins/keyfile/keyfile.cpp -@@ -314,7 +314,7 @@ Error _checkVersion(const API *api) { - ERROR_LEVEL_NORMAL, - HBCI_ERROR_CODE_MEDIUM, - ERROR_ADVISE_DONTKNOW, -- "need OpenHBCI v"OPENHBCI_VERSION_FULL_STRING -+ "need OpenHBCI v" OPENHBCI_VERSION_FULL_STRING - " or newer"); - } - diff --git a/finance/openhbci/files/patch-transaction.cpp b/finance/openhbci/files/patch-transaction.cpp deleted file mode 100644 index 2cd1a0072bfa..000000000000 --- a/finance/openhbci/files/patch-transaction.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/openhbci/core/transaction.cpp.orig Sun Jul 20 16:02:04 2003 -+++ src/openhbci/core/transaction.cpp Sun Jul 20 16:02:48 2003 -@@ -34,6 +34,7 @@ - #include <config.h> - #endif - -+#include <assert.h> - #include "transaction.h" - #include "hbcistring.h" - diff --git a/finance/openhbci/pkg-descr b/finance/openhbci/pkg-descr deleted file mode 100644 index 0ba08c2db22e..000000000000 --- a/finance/openhbci/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -OpenHBCI -- the first free client-side implementation of the HBCI -specification. - -HBCI is a bank-independent homebanking standard used by many German -banks. This publicly available protocol describes communication, -authentification, encryption, and business transactions taking place -between a homebanking applications and a bank's server. OpenHBCI -provides an object oriented library implementing the current -client-side HBCI specification. The library is written in C++, with C -wrappers also available. OpenHBCI provides the application programmer -with a high-level abstraction of almost all business transactions, so -that all HBCI details are totally encapsulated and do not need to be -bothered with. - -WWW: http://openhbci.sourceforge.net diff --git a/finance/openhbci/pkg-plist b/finance/openhbci/pkg-plist deleted file mode 100644 index 156c86b5c6f1..000000000000 --- a/finance/openhbci/pkg-plist +++ /dev/null @@ -1,77 +0,0 @@ -bin/openhbci-config -include/openhbci.h -include/openhbci/abstracttrans.h -include/openhbci/account.h -include/openhbci/accountparams.h -include/openhbci/adminjobs.h -include/openhbci/api.h -include/openhbci/api_c.h -include/openhbci/auth.h -include/openhbci/balance.h -include/openhbci/bank.h -include/openhbci/bankparams.h -include/openhbci/bpdjob.h -include/openhbci/cmdlineoptions.h -include/openhbci/conf.h -include/openhbci/cryptkey.h -include/openhbci/customer.h -include/openhbci/date.h -include/openhbci/datetime.h -include/openhbci/deskey.h -include/openhbci/directory.h -include/openhbci/dllimport.h -include/openhbci/error.h -include/openhbci/file.h -include/openhbci/filestream.h -include/openhbci/hbci.h -include/openhbci/hbcistring.h -include/openhbci/hbcistringlist.h -include/openhbci/inetaddress.h -include/openhbci/init_plugins.h -include/openhbci/interactor.h -include/openhbci/interactorcb.h -include/openhbci/job.h -include/openhbci/libloader.h -include/openhbci/limit.h -include/openhbci/listwrappers.h -include/openhbci/loader.h -include/openhbci/medium.h -include/openhbci/mediumplugin.h -include/openhbci/mediumpluginfile.h -include/openhbci/mediumpluginlist.h -include/openhbci/mediumrdhbase.h -include/openhbci/messagequeue.h -include/openhbci/outbox.h -include/openhbci/outboxaccjobs.h -include/openhbci/outboxjob.h -include/openhbci/outboxjobkeys.h -include/openhbci/outboxjobs.h -include/openhbci/outboxstojobs.h -include/openhbci/parser.h -include/openhbci/plugin.h -include/openhbci/pluginfile.h -include/openhbci/pointer.h -include/openhbci/progressmonitor.h -include/openhbci/progressmonitorcb.h -include/openhbci/rsakey.h -include/openhbci/simpleconfig.h -include/openhbci/socket.h -include/openhbci/standingorder.h -include/openhbci/statusreport.h -include/openhbci/stream.h -include/openhbci/swiftparser.h -include/openhbci/transaction.h -include/openhbci/tree.h -include/openhbci/updjob.h -include/openhbci/user.h -include/openhbci/userparams.h -include/openhbci/value.h -lib/libopenhbci.a -lib/libopenhbci.so -lib/libopenhbci.so.14 -lib/libopenhbci.so.14.0.2 -lib/openhbci/plugins/14/media/rdhfile.a -lib/openhbci/plugins/14/media/rdhfile.so -lib/openhbci/plugins/14/media/rdhfile.so.0 -lib/openhbci/plugins/14/media/rdhfile.so.0.0.0 -share/aclocal/openhbci.m4 diff --git a/graphics/Makefile b/graphics/Makefile index 492955e58b9d..0352e771d2cd 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -813,7 +813,6 @@ SUBDIR += py-editobj SUBDIR += py-exif SUBDIR += py-exifread - SUBDIR += py-exiv2 SUBDIR += py-fiona SUBDIR += py-freeimagepy SUBDIR += py-gd diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile deleted file mode 100644 index 299a64102a91..000000000000 --- a/graphics/py-exiv2/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Denis Barov <dindin@dindin.ru> -# $FreeBSD$ - -PORTNAME= exiv2 -PORTVERSION= 0.3.2 -PORTREVISION= 16 -CATEGORIES= graphics python -MASTER_SITES= https://launchpadlibrarian.net/83595798/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= multimedia@FreeBSD.org -COMMENT= Python bindings for exiv2 - -LIB_DEPENDS= libexiv2.so:graphics/exiv2\ - ${PY_BOOST} - -USES= python:2.7 scons tar:bzip2 -USE_PYTHON= flavors -USE_LDCONFIG= yes -CXXFLAGS+= -I${LOCALBASE}/include -MAKE_ARGS+= prefix=${PREFIX} use_env=1 BOOSTLIB="${PY_BOOST_LIB}" - -BROKEN= Does not work with exiv2 > 0.26 -DEPRECATED= py-exiv2 has been deprecated in favour of GExiv2 -EXPIRATION_DATE= 2019-03-31 - -post-patch: - ${REINPLACE_CMD} -e 's|python_inc_path\]|python_inc_path,\ - "${PREFIX}/include"\]|' -e 's|LIBS=libs|LIBS=libs,\ - LIBPATH=\"${PREFIX}/lib\"|'\ - ${WRKSRC}/src/SConscript - -post-install: - cd ${STAGEDIR}/${PYTHON_SITELIBDIR}/pyexiv2; ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py . - -regression-test: build - @cd ${WRKSRC} && ${MAKE_CMD} test - -.include <bsd.port.mk> diff --git a/graphics/py-exiv2/distinfo b/graphics/py-exiv2/distinfo deleted file mode 100644 index 8dbc84d79024..000000000000 --- a/graphics/py-exiv2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pyexiv2-0.3.2.tar.bz2) = 0abc117c6afa71f54266cb91979a5227f60361db1fcfdb68ae9615398d7a2127 -SIZE (pyexiv2-0.3.2.tar.bz2) = 283163 diff --git a/graphics/py-exiv2/pkg-descr b/graphics/py-exiv2/pkg-descr deleted file mode 100644 index 5ef8b3e0116c..000000000000 --- a/graphics/py-exiv2/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -pyexiv2 is a python binding to exiv2, the C++ library for manipulation of -EXIF and IPTC image metadata. It is a python module that allows your python -scripts to read and write metadata (EXIF, IPTC, thumbnail) embedded in image -files (JPEG, TIFF, ...). - -It is designed as a high level interface to the functionalities offered by -exiv2 (and is built on top of it). Using python's built-in data types and -standard modules, it provides easy manipulation of image metadata. - -WWW: https://launchpad.net/pyexiv2 diff --git a/graphics/py-exiv2/pkg-plist b/graphics/py-exiv2/pkg-plist deleted file mode 100644 index 68716e1aba1c..000000000000 --- a/graphics/py-exiv2/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -%%PYTHON_SITELIBDIR%%/libexiv2python.so -%%PYTHON_SITELIBDIR%%/pyexiv2/__init__.py -%%PYTHON_SITELIBDIR%%/pyexiv2/__init__.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/exif.py -%%PYTHON_SITELIBDIR%%/pyexiv2/exif.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/iptc.py -%%PYTHON_SITELIBDIR%%/pyexiv2/iptc.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/metadata.py -%%PYTHON_SITELIBDIR%%/pyexiv2/metadata.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/preview.py -%%PYTHON_SITELIBDIR%%/pyexiv2/preview.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/utils.py -%%PYTHON_SITELIBDIR%%/pyexiv2/utils.pyc -%%PYTHON_SITELIBDIR%%/pyexiv2/xmp.py -%%PYTHON_SITELIBDIR%%/pyexiv2/xmp.pyc diff --git a/mail/Makefile b/mail/Makefile index 60dfe392c222..408bcd38ef7d 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -85,7 +85,6 @@ SUBDIR += cyrus2dovecot SUBDIR += davmail SUBDIR += dbmail - SUBDIR += dbmail22 SUBDIR += dcc-dccd SUBDIR += deforaos-mailer SUBDIR += delatt diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile deleted file mode 100644 index ad0c1c17a6a6..000000000000 --- a/mail/dbmail22/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org> -# $FreeBSD$ - -PORTNAME= dbmail -PORTVERSION= 2.2.18 -PORTREVISION= 6 -CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/2.2/ -PKGNAMESUFFIX= 22 - -MAINTAINER= bofh@FreeBSD.org -COMMENT= SQL database-based mail system (POP3 and IMAP) - -LICENSE= GPLv2 - -DEPRECATED= Please use mail/dbmail which uses latest version of 3.X -EXPIRATION_DATE= 2019-04-04 - -LIB_DEPENDS= libgmime-2.0.so:mail/gmime2 - -USES= gmake gnome libtool pkgconfig ssl -USE_LDCONFIG= ${PREFIX}/lib/dbmail -USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved -USE_GNOME= glib20 - -CONFLICTS= dbmail-3.* - -OPTIONS_DEFINE= DOCS LDAP SIEVE -OPTIONS_DEFAULT=MYSQL -OPTIONS_MULTI= DB -OPTIONS_MULTI_DB=MYSQL PGSQL SQLITE -SIEVE_DESC= Support for Sieve mail sorting language - -OPTIONS_SUB= yes - -MYSQL_USES= mysql -MYSQL_CONFIGURE_WITH= mysql -SQLITE_USES= sqlite:3 -SQLITE_CONFIGURE_WITH= sqlite -PGSQL_USES= pgsql -PGSQL_CONFIGURE_WITH= pgsql -SIEVE_CONFIGURE_WITH= sieve -SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes -INSTALL_TARGET= install-strip - -GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} -CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail -MAKE_ARGS+= mandir=${MANPREFIX}/man - -PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \ - README.aliases README.exim README.ldap \ - README.postfix README.qmail README.sieve \ - README.smtp README.solaris README.usermap \ - THANKS -SUB_FILES= pkg-message - -PLIST_SUB+= PORTNAME=${PORTNAME} - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMYSQL} -DATABASE+= mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -DATABASE+= postgresql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -DATABASE+= sqlite -.endif - -post-configure: - ${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h - -post-install: - ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist - ${MKDIR} ${STAGEDIR}${DATADIR} - for f in ${DATABASE}; do \ - ${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \ - ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \ - done - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo deleted file mode 100644 index 0a1e7be5df29..000000000000 --- a/mail/dbmail22/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (dbmail-2.2.18.tar.gz) = cdf3ac1346515ebcad4b6f19879ccff3879007f2fec1b97cdb4cd72d5892cc07 -SIZE (dbmail-2.2.18.tar.gz) = 833841 diff --git a/mail/dbmail22/files/dbmail-imapd.in b/mail/dbmail22/files/dbmail-imapd.in deleted file mode 100644 index 7d1ca96ea7d0..000000000000 --- a/mail/dbmail22/files/dbmail-imapd.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-imapd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-imapd: -# -# dbmail_imapd_enable="YES" -# dbmail_imapd_flags="<set as needed>" -# -# See dbmail-imapd(8) for flags -# - -. /etc/rc.subr - -name=dbmail_imapd -rcvar=dbmail_imapd_enable - -command=%%PREFIX%%/sbin/dbmail-imapd -pidfile=/var/run/dbmail-imapd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_imapd_enable="NO"} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-lmtpd.in b/mail/dbmail22/files/dbmail-lmtpd.in deleted file mode 100644 index f1805db488b1..000000000000 --- a/mail/dbmail22/files/dbmail-lmtpd.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-lmtpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: -# -# dbmail_lmtpd_enable="YES" -# dbmail_lmtpd_flags="<set as needed>" -# -# See dbmail-lmtpd(8) for flags -# - -. /etc/rc.subr - -name=dbmail_lmtpd -rcvar=dbmail_lmtpd_enable - -command=%%PREFIX%%/sbin/dbmail-lmtpd -pidfile=/var/run/dbmail-lmtpd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_lmtpd_enable="NO"} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-pop3d.in b/mail/dbmail22/files/dbmail-pop3d.in deleted file mode 100644 index 71a567fbd393..000000000000 --- a/mail/dbmail22/files/dbmail-pop3d.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-pop3d -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-pop3d: -# -# dbmail_pop3d_enable="YES" -# dbmail_pop3d_flags="<set as needed>" -# -# See dbmail-pop3d(8) for flags -# - -. /etc/rc.subr - -name=dbmail_pop3d -rcvar=dbmail_pop3d_enable - -command=%%PREFIX%%/sbin/dbmail-pop3d -pidfile=/var/run/dbmail-pop3d.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_pop3d_enable="NO"} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-timsieved.in b/mail/dbmail22/files/dbmail-timsieved.in deleted file mode 100644 index 27eb49540333..000000000000 --- a/mail/dbmail22/files/dbmail-timsieved.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-timsieved -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-timsieved: -# -# dbmail_timsieved_enable="YES" -# dbmail_timsieved_flags="<set as needed>" -# -# See dbmail-timsieved(8) for flags -# - -. /etc/rc.subr - -name=dbmail_timsieved -rcvar=dbmail_timsieved_enable - -command=%%PREFIX%%/sbin/dbmail-timsieved -pidfile=/var/run/dbmail-timsieved.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_timsieved_enable="NO"} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/patch-configure b/mail/dbmail22/files/patch-configure deleted file mode 100644 index dfb4b14255dc..000000000000 --- a/mail/dbmail22/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2012-01-20 08:14:04 UTC -+++ configure -@@ -2967,7 +2967,7 @@ ldapprefixes="/usr /usr/local" - sieveprefixes="/usr /usr/local" - - --$as_echo "#define _GNU_SOURCE ''" >>confdefs.h -+$as_echo '#define _GNU_SOURCE' >>confdefs.h - - - # Turn off both defaults. diff --git a/mail/dbmail22/files/pkg-message.in b/mail/dbmail22/files/pkg-message.in deleted file mode 100644 index 8e9dfc1a7650..000000000000 --- a/mail/dbmail22/files/pkg-message.in +++ /dev/null @@ -1,29 +0,0 @@ - -IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!! - - *) Don't forget to update the database using a script from - %%DATADIR%%/ - *) Many programs have been renamed and their arguments changed. - *) Read the upgrading notes. - *) Don't be careless with this upgrade or mail will be lost! - *) dbmail can be controled by setting dbmail_imapd_enable, - dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in - /etc/rc.conf. - - -NOTE FOR ADMINS UPGRADING FROM 2.0.X -> 2.2.X : - *) Update database using a script - %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql or - %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql - *) Run `dbmail-util -by' - *) Edit configuration file - `[DBMAIL]' section must have `driver=mysql/pgsql' and - `authdriver=sql/ldap'. - -NOTE FOR ADMINS UPGRADING FROM 2.1.X -> 2.2 : - - *) Update database using a script - %%DATADIR%%/mysql/2_1_7-2_2_0.mysql (if you're using MySQL) - %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql (PostgreSQL) - %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite (SQLite3) - *) Run `dbmail-util -by' diff --git a/mail/dbmail22/pkg-descr b/mail/dbmail22/pkg-descr deleted file mode 100644 index 5c1648e0e4a6..000000000000 --- a/mail/dbmail22/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -Dbmail is the name of a group of programs that enable the possibility of -storing and retrieving mail messages from a database (currently MySQL, -PostgreSQL or SQLite). - -* Scalability. - Dbmail is as scalable as the database system that is used for the mail - storage. In theory millions of accounts can be managed using dbmail. One - could, for example, run 4 different servers with the pop3 daemon each - connecting to the same database (cluster) server. -* Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing settings - in the database (f.e. using PHP/Perl/SQL), without needing shell access. -* Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. -* Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail is - as secure as the database it's based upon. -* Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. - -WWW: http://www.dbmail.org/ diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist deleted file mode 100644 index 5018b936b28a..000000000000 --- a/mail/dbmail22/pkg-plist +++ /dev/null @@ -1,53 +0,0 @@ -@sample etc/dbmail.conf-dist etc/dbmail.conf -%%LDAP%%lib/dbmail/libauth_ldap.so -%%LDAP%%lib/dbmail/libauth_ldap.so.0 -%%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0 -lib/dbmail/libauth_sql.so -lib/dbmail/libauth_sql.so.0 -lib/dbmail/libauth_sql.so.0.0.0 -lib/dbmail/libdbmail.so -lib/dbmail/libdbmail.so.0 -lib/dbmail/libdbmail.so.0.0.0 -%%MYSQL%%lib/dbmail/libmysql.so -%%MYSQL%%lib/dbmail/libmysql.so.0 -%%MYSQL%%lib/dbmail/libmysql.so.0.0.0 -%%PGSQL%%lib/dbmail/libpgsql.so -%%PGSQL%%lib/dbmail/libpgsql.so.0 -%%PGSQL%%lib/dbmail/libpgsql.so.0.0.0 -%%SIEVE%%lib/dbmail/libsort_sieve.so -%%SIEVE%%lib/dbmail/libsort_sieve.so.0 -%%SIEVE%%lib/dbmail/libsort_sieve.so.0.0.0 -%%SQLITE%%lib/dbmail/libsqlite.so -%%SQLITE%%lib/dbmail/libsqlite.so.0 -%%SQLITE%%lib/dbmail/libsqlite.so.0.0.0 -man/man1/dbmail-smtp.1.gz -man/man1/dbmail.1.gz -man/man5/dbmail.conf.5.gz -man/man8/dbmail-export.8.gz -man/man8/dbmail-imapd.8.gz -man/man8/dbmail-lmtpd.8.gz -man/man8/dbmail-pop3d.8.gz -man/man8/dbmail-sievecmd.8.gz -man/man8/dbmail-timsieved.8.gz -man/man8/dbmail-users.8.gz -man/man8/dbmail-util.8.gz -sbin/dbmail-export -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d -%%SIEVE%%sbin/dbmail-sievecmd -sbin/dbmail-smtp -%%SIEVE%%sbin/dbmail-timsieved -sbin/dbmail-users -sbin/dbmail-util -%%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql -%%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql -%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_2.0_to_2.2.mysql -%%MYSQL%%share/%%PORTNAME%%/mysql/update_headervalue_01.mysql -%%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql -%%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql -%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql -%%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite -%%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite diff --git a/net/Makefile b/net/Makefile index d099a70d7e0b..c312be73d6f9 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1230,7 +1230,6 @@ SUBDIR += rubygem-fog-dynect SUBDIR += rubygem-fog-ecloud SUBDIR += rubygem-fog-google - SUBDIR += rubygem-fog-google17 SUBDIR += rubygem-fog-internet-archive SUBDIR += rubygem-fog-joyent SUBDIR += rubygem-fog-local diff --git a/net/rubygem-fog-google17/Makefile b/net/rubygem-fog-google17/Makefile deleted file mode 100644 index ef75e78df5c7..000000000000 --- a/net/rubygem-fog-google17/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= fog-google -PORTVERSION= 1.7.1 -CATEGORIES= net rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 17 - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Module for the 'fog' gem to support Google Cloud - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.md - -DEPRECATED= Use net/rubygem-fog-google instead -EXPIRATION_DATE=2019-03-31 - -RUN_DEPENDS= rubygem-fog-core>=0:devel/rubygem-fog-core \ - rubygem-fog-json>=0:devel/rubygem-fog-json \ - rubygem-fog-xml>=0:textproc/rubygem-fog-xml \ - rubygem-google-api-client>=0.23.0:devel/rubygem-google-api-client - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -PORTSCOUT= limit:^1\.7\. - -.include <bsd.port.mk> diff --git a/net/rubygem-fog-google17/distinfo b/net/rubygem-fog-google17/distinfo deleted file mode 100644 index ee1aa2fe503c..000000000000 --- a/net/rubygem-fog-google17/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1534962005 -SHA256 (rubygem/fog-google-1.7.1.gem) = e207eb2a2dcae3f387c316e1d98b6848fea92544c6374959e8e0c560400cfa2b -SIZE (rubygem/fog-google-1.7.1.gem) = 139776 diff --git a/net/rubygem-fog-google17/files/patch-gemspec b/net/rubygem-fog-google17/files/patch-gemspec deleted file mode 100644 index b9abf6c3237d..000000000000 --- a/net/rubygem-fog-google17/files/patch-gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- fog-google.gemspec.orig 2018-09-21 22:25:33 UTC -+++ fog-google.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - s.add_runtime_dependency(%q<fog-core>.freeze, [">= 0"]) - s.add_runtime_dependency(%q<fog-json>.freeze, [">= 0"]) - s.add_runtime_dependency(%q<fog-xml>.freeze, [">= 0"]) -- s.add_runtime_dependency(%q<google-api-client>.freeze, ["~> 0.23.0"]) -+ s.add_runtime_dependency(%q<google-api-client>.freeze, ["~> 0.23"]) - s.add_development_dependency(%q<mime-types>.freeze, [">= 0"]) - s.add_development_dependency(%q<pry>.freeze, [">= 0"]) - s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"]) diff --git a/net/rubygem-fog-google17/pkg-descr b/net/rubygem-fog-google17/pkg-descr deleted file mode 100644 index 963d8ec6cc87..000000000000 --- a/net/rubygem-fog-google17/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Fog currently supports two Google Cloud services (Google Compute Engine and -Google Cloud Storage) via Fog::Google. - -WWW: https://github.com/fog/fog-google diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile index 2e063bb248d6..5abfb5288d0e 100644 --- a/ports-mgmt/Makefile +++ b/ports-mgmt/Makefile @@ -3,7 +3,6 @@ COMMENT = Ports for managing, installing, and developing FreeBSD ports and packages - SUBDIR += bsdadminscripts SUBDIR += bsdadminscripts2 SUBDIR += caronade SUBDIR += chucky diff --git a/ports-mgmt/bsdadminscripts/Makefile b/ports-mgmt/bsdadminscripts/Makefile deleted file mode 100644 index e24d0511b271..000000000000 --- a/ports-mgmt/bsdadminscripts/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# $FreeBSD$ - -PORTNAME= bsdadminscripts -PORTVERSION= 6.1.1 -PORTREVISION= 8 -CATEGORIES= ports-mgmt sysutils -MASTER_SITES= SF/${PORTNAME}/${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Collection of administration scripts - -LICENSE= BSD2CLAUSE - -DEPRECATED= Upstream stale nearly 10 years, no longer works properly, use ports-mgmt/bsdadminscripts2 instead -EXPIRATION_DATE= 2019-03-31 - -NO_BUILD= yes -NO_ARCH= yes - -TMP?= /tmp -VAR?= /var - -PORTDOCS= ABOUT CHANGES INSTALL NOTES THANKS - -OPTIONS_DEFINE= DOCS - -SUB_FILES= distviper pkg_libchk pkg_upgrade uma -SUB_LIST= TMP=${TMP} PREFIX=${PREFIX} VAR=${VAR} PORTS=${PORTSDIR} - -DOCS_VARS_OFF= EVALDOCS=-nodoc - -do-install: - cd ${WRKSRC}/src && ${SH} install.sh \ - -prefix=${STAGEDIR}${PREFIX} \ - -ports=${STAGEDIR}${PORTSDIR} \ - -distdir=${STAGEDIR}${DISTDIR} \ - -datadir=${STAGEDIR}${DATADIR} \ - ${EVALDOCS} -.for n in distviper pkg_libchk pkg_upgrade uma - ${MV} ${WRKDIR}/${n} ${WRKSRC}/src - ${INSTALL_SCRIPT} ${WRKSRC}/src/${n} ${STAGEDIR}${PREFIX}/sbin -.endfor - ${INSTALL_DATA} ${WRKSRC}/src/buildflags.mk ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/buildflags.conf.sample \ - ${STAGEDIR}${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/src/uma.conf.sample ${STAGEDIR}${PREFIX}/etc - -.for f in bsdadminscripts buildflags.awk buildflags.conf buildflags.mk \ - distviper pkg_libchk pkg_upgrade pkg_validate portconfig rcstart uma - ${INSTALL_MAN} ${WRKSRC}/src/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.endfor - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR} - ${RM} -r ${STAGEDIR}${PREFIX}/etc/*.sample - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/ports-mgmt/bsdadminscripts/distinfo b/ports-mgmt/bsdadminscripts/distinfo deleted file mode 100644 index db18c95f2235..000000000000 --- a/ports-mgmt/bsdadminscripts/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bsdadminscripts-6.1.1.tar.gz) = 68b47c51801a8ce1e7b69ec654c7521b1b1fcf2d3fe9184f4d2e4a1b6f4656bb -SIZE (bsdadminscripts-6.1.1.tar.gz) = 73925 diff --git a/ports-mgmt/bsdadminscripts/files/distviper.in b/ports-mgmt/bsdadminscripts/files/distviper.in deleted file mode 100644 index e047e46b67de..000000000000 --- a/ports-mgmt/bsdadminscripts/files/distviper.in +++ /dev/null @@ -1,227 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2009 -# Dominic Fandrey <kamikaze@bsdforen.de> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -readonly name=distviper -readonly version=1.1 - -verbose= -demo= -quiet= -interactive= - -# Determine portsdir -portsdir="$(make -V PORTSDIR -f /usr/share/mk/bsd.port.mk)" -if [ ! -d "$portsdir" ]; then - echo "The PORTSDIR '$portsdir' is missing." - exit 1 -fi - -# Determine distdir -distdir="$(make -V DISTDIR -f /usr/share/mk/bsd.port.mk)" -if [ ! -d "$distdir" ]; then - echo "The DISTDIR '$distdir' is missing." - exit 2 -fi - -# Extract file from distinfo. -extractFileCmd="sed -E -e 's/^[^(]*\(//1' -e 's/\).*$//1'" - -# Display help. -printHelp() { - echo "$name v$version -usage: $name [-d] [-h] [-i] [-q] [-v] [fast|thorough]" -} - -# -# Handle parameters. -# -# @param $1 -# The parameter to handle. -# @param $verbose -# Is set to create verbose output. -# @param $demo -# Is set to only print the output that would occur. -# @param $quiet -# Is set to act without creating any output. -# @return -# Returns 0 if the processed parameter was a valid parameter, -# returns 1 if not. -# -readParams() { - case "$1" in - "-d" | "--demo") - demo=1 - return 0 - ;; - "-h" | "--help") - printHelp - exit 0 - ;; - "-i" | "--interactive") - interactive=-i - return 0 - ;; - "-q" | "--quiet") - quiet=1 - return 0 - ;; - "-v" | "--verbose") - verbose=1 - return 0 - ;; - -? | --*) - return 1 - ;; - -*) - # Split parameters. - # first parameter - readParams "${1%${1#-?}}" || return $? - # remaining parameters - readParams "-${1#-?}" - return $? - ;; - *) - return 1 - ;; - esac -} - -# -# This algorithm outputs the distfiles of installed ports. If a port downloads -# a distfile through depending on the fetch target of another port, it -# is missed, in case that other port is not installed as well. -# -# @param $portsdir -# The direcotry holding the ports tree. -# -getDistFiles_fast() { - for port in $(pkg_info -qoa); { - if [ -e "$portsdir/$port/distinfo" ]; then - eval "$extractFileCmd '$portsdir/$port/distinfo'" | uniq - fi - } -} - -# -# This algorithm outputs the distfiles of all ports. -# -# @param $portsdir -# The direcotry holding the ports tree. -# -getDistFiles_thorough() { - find -H "$portsdir" -type f -name distinfo | \ - eval "xargs $extractFileCmd" | uniq -} - -# The current parameter processing stage. -stage=params - -# The selected algorithm for finding distfiles to keep. -algorithm=thorough - -# Parse the command line parameters. -for command; { - # Read parameters until an unknown one is encountered. - # In that case switch into command stage. - if [ "$stage" = "params" ]; then - if ! readParams "$command"; then - stage=command - fi - fi - - # All parameters have been read, now either nothing or a mode - # command should occur. - if [ "$stage" = "command" ]; then - stage=end - case "$command" in - thorough | fast) - algorithm="$command" - ;; - -*) - echo "$name: Unknown parameter '$command'" \ - "encountered, exiting." 1>&2 - return 1 - ;; - *) - echo "$name: Unknown command '$command'" \ - "encountered, exiting." 1>&2 - return 2 - ;; - esac - # Skip everything following and continue with the next - # argument. - continue - fi - - # Still being in the loop at this stage means unexpected parameters - # have been encountered. - if [ "$stage" = "end" ]; then - echo "$name: The command '$command' is not allowed here, only" \ - "one command at a time is permitted." 1>&2 - return 3 - fi -} - -# Check for inprobable options. -if [ -n "$interactive" -a -n "$demo" ]; then - echo "$name: Interactive mode is ignored in demo mode." 1>&2 -fi - -test -n "$verbose" && echo "Create a list of up to date distfiles to keep" \ - "using a $algorithm algorithm:" - -# Create the list of files to keep, using the selected algorithm. -keepFiles="$(eval "getDistFiles_$algorithm" | sort -u)" -if [ -n "$verbose" ]; then - echo "$(($(echo "$keepFiles" | wc -l))) files recorded for keeping." - echo "Search and delete outdated distfiles:" -fi - -# Files before deletion. -filesCount="$(($(find -H "$distdir" -type f|wc -l)))" -filesDelete=0 - -# Seek and destroy files not in the $keepFiles list. -for file in $(find -H "$distdir" -type f); { - file="${file#$distdir/}" - - if (echo "$keepFiles" | grep -qx "$file"); then - test -n "$verbose" && echo "keep $file" - else - test -z "$quiet" && echo "delete $file" - test -z "$demo" && rm $interactive "$distdir/$file" - filesDelete=$(($filesDelete + 1)) - fi -} - -# The number of deleted files -filesDeleted="$(($filesCount - $(find -H "$distdir" -type f|wc -l)))" - -test -z "$demo" && find -H -d "$distdir" -type d -exec rmdir \{} \; 2> /dev/null - -if [ -n "$verbose" ]; then - echo "$filesDelete files were suggested for deletion." - echo "$filesDeleted files of $filesCount have been removed." -fi - -return 0 diff --git a/ports-mgmt/bsdadminscripts/files/pkg_libchk.in b/ports-mgmt/bsdadminscripts/files/pkg_libchk.in deleted file mode 100644 index 232e00947f54..000000000000 --- a/ports-mgmt/bsdadminscripts/files/pkg_libchk.in +++ /dev/null @@ -1,484 +0,0 @@ -#!/bin/sh -f -# -# Copyright (c) 2007-2009 -# Dominic Fandrey <kamikaze@bsdforen.de> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -readonly name=pkg_libchk -readonly version=1.6.1 -readonly osname=`uname -s` -readonly pkgng=`make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG` - -# Use a line break as delimiter. -IFS=' -' - -# Filename prefix for shared data -sharedprefix="%%TMP%%/$$" -shared="locks" - -# -# This function remembers a lock to allow later deletion with the -# lockUnregisterAll() function. -# -# @param $1 -# The name of the lock. -lockRegister() { - local lock - lock="$sharedprefix-$shared" - lockf -k "$lock" sh -c " - if ! grep -qE '^$1\$' '$lock'; then - echo '$1' >> '$lock' - fi - " -} - -# -# Unregisters all locks. -# -lockUnregisterAll() { - wait - for register in $(cat "$sharedprefix-$shared"); { - lockf "$sharedprefix-$register" wait - } - lockf "$sharedprefix-$shared" wait -} - -# -# This function creates a semaphore. -# -# @param $1 -# The name of the semaphore. -# @param $2 -# The size of the semaphore. -# -semaphoreCreate() { - local lock - lockRegister "semaphore-$1" - lock="$sharedprefix-semaphore-$1" - lockf -k "$lock" echo "$2" > "$lock" - eval "semaphore_$1_size=$2" -} - -# -# This function waits until the semaphore is free und registers its use. -# Everything that uses this also has to call the semaphoreFree() function. -# -# @param $1 -# The name of the semaphore. -# -semaphoreUse() { - local lock semaphores - lock="$sharedprefix-semaphore-$1" - while ! lockf -k "$lock" sh -c " - state=\$(cat '$lock') - if [ \"\$state\" -gt 0 ]; then - echo \"\$((\$state - 1))\" > '$lock' - exit 0 - fi - exit 1 - "; do - sleep 0.1 - done -} - -# -# This function frees a semaphore. -# -# @param $1 -# The name of the semaphore. -# -semaphoreFree() { - local lock - lock="$sharedprefix-semaphore-$1" - lockf -k "$lock" sh -c " - state=\"\$((\"\$(cat '$lock')\" + 1))\" - echo \"\$state\" > '$lock' - " -} - -# -# This function sets a new status and prints it. -# -# @param $1 -# The status message. -# @param $clean -# If set status handling is disabled. -# -statusSet() { - # In clean mode status handling is disabled. - test -z "$clean" || return 0 - local lock - lock="$sharedprefix-status" - lockf -k "$lock" sh -c " - status=\"\$(cat '$lock')\" - echo '$1' > '$lock' - printf \"\\r%-\${#status}s\\r\" '$1' > /dev/tty - " -} - -# -# This function prints a message and the current status behind it. -# -# @param $1 -# The message to print. -# @param $clean -# If set the status will not be printed. -# -statusPrint() { - if [ -z "$clean" ]; then - local lock - lock="$sharedprefix-status" - lockf -k "$lock" sh -c " - status=\"\$(cat '$lock')\" - printf \"%-\${#status}s\\r\" '' > /dev/tty - echo '$1' - printf '%s\\r' \"\$status\" > /dev/tty - " - else - echo "$1" - fi -} - -# -# Waits for a semaphore to be completely free and counts down the remaining -# number of locks. -# -# @param $1 -# The semaphore to watch. -# @param $2 -# The status message to print, insert %d in the place where the number -# of remaining locks belong. -# -semaphoreCountDown() { - local free size - while read -t1 free < "$sharedprefix-semaphore-$1"; do - size=$(eval "echo \$semaphore_$1_size") - statusSet "$(printf "$2" $(( $size - $free )))" - test "$free" -eq "$size" && break - sleep 0.1 - done - wait -} - -# Clean up upon exit. -trap ' - semaphoreCountDown jobs "Terminated by signal, waiting for %d jobs to die." - echo > /dev/tty - lockUnregisterAll - exit 255 -' int term - -# -# This function checks whether a given binary or library directly depends -# on a missing library. -# It goes a long way to prevent all kinds of false positives. -# It always returns 2 (false) for Linux and other non-native libraries -# and binaries. -# It also checks whether the missing dependency is really a direct dependency -# (indirect dependencies have to be fixed somewhere else). -# -# @param $1 -# The library or binary to check. -# @return -# Returns 0 (true) if a library is missing. -# Returns 1 if everything is all right. -# Returns 2 if the check cannot be performed (not a native library). -# -dependencyMissing() { - local missing file direct libfound - - # We cannot handle non-native binaries, - # so assume everything is in order. - if ! readelf -e "$1" 2>&1 | \ - grep -E "^[[:space:]]*OS/ABI:[[:space:]]*UNIX - $osname\$" \ - > /dev/null - then - return 2 - # Nothing is missing. - elif ! missing="$(ldd "$1" 2>&1 | grep -E "$match_expr")"; then - return 1 - fi - - # The return status. The value 1 assumes that this is a false positive. - status=1 - - # Only report misses for direct dependencies. - direct="$( - readelf -d "$1" 2> /dev/null | \ - grep 'Shared library:' | \ - sed -E -e 's|^[^[]*\[||1' -e 's|\]$||1' - )" - - # Compare every missing depency with the list of direct dependencies - # and report that the dependency is missing if the missing file is - # a direct dependency. - for file in $missing; { - # Strip the missing file of additional information. - file="$(echo "$file" | sed -E \ - -e 's| => .*$||1' \ - -e 's|^[[:space:]]*||1' \ - -e 's|^.*dependency ||1' \ - -e 's| not found$||1' - )" - - # If in mean mode we do not check for false positives. - if [ -n "$mean" ]; then - test -n "$raw" && return 0 - statusPrint "$package_name: $1 misses $file" - continue - fi - - # Handle the case where a library is not found, but exists - # somewhere in the package. This is for packages that do not - # rely on the OS to find libraries. - libfound= - for library in $(echo "$libraries" | grep -E "/$file\$"); { - # The library exists after all. - test -e "$library" && libfound=1 && break - } - if test "$libfound"; then - test -n "$verbose" && statusPrint "$package_name: \ -located: $1 misses $file found at $library." - continue - fi - - # Compare the file with the list of direct dependencies. - # If it's not in than it's only an indirect dependency and - # cannot be fixed by rebuilding this port. - if echo "$direct" | grep -E "^$file\$" > /dev/null; then - test -n "$raw" && return 0 - statusPrint "$package_name: $1 misses $file" - status=0 - elif [ -n "$verbose" ]; then - statusPrint "$package_name: inderect: $1 \ -misses $file is an inderect dependency." - fi - } - - return $status -} - -# -# Checks the parameters for options. -# -# @param $packages -# The parameters to pkg_info -E that will result in the -# names of the packages to work on. -# @param $recursive -# Contains the appropriate parameter to get the -# dependencies of the given packages from pkg_info. -# @param $Recursive -# Contains the appropriate parameter to get the -# packages depending on the given packages from pkg_info. -# @param $raw -# Is set to trigger raw printing. -# @param $clean -# Is set to trigger printing without status messages. -# @param $verbose -# Is set to be verbose about false positives. -# @param $mean -# Is set to switch into mean mode. That means no -# checking of false positives. -# @param $compat -# Delete to avoid detecting compat libraries as misses. -# @param $origin -# Is set to turn the print origin mode on. -# @semaphore jobs -# Is set to limit the amount of parallel jobs. -# -readParams() { - local option - - for option { - case "$option" in - "-a" | "--all") - packages="-a" - ;; - "-c" | "--clean") - clean=1 - ;; - "-h" | "--help") - printHelp - ;; - -j* | --jobs*) - local jobs - jobs="${option#-j}" - jobs="${jobs#--jobs}" - if [ "$jobs" -ne "$jobs" ] 2> /dev/null; then - echo "The -j option must be followed" \ - "by a number." - exit 3 - elif [ "$jobs" -lt 1 ]; then - echo "The -j option must specify at" \ - "least 1 job." - exit 3 - else - semaphoreCreate jobs "$jobs" - fi - ;; - "-m" | "--mean") - mean=1 - ;; - "-n" | "--no-compat") - compat= - ;; - "-o" | "--origin") - origin=1 - ;; - "-q" | "--raw") - raw=1 - if [ -n "$verbose" ]; then - echo "The parameters -v and -q may" \ - "not be used at the same time." - exit 2 - fi - ;; - "-r" | "--recursive") - recursive="-r" - ;; - "-R" | "--upward-recursive") - Recursive="-R" - ;; - "-v" | "--verbose") - verbose=1 - if [ -n "$raw" ]; then - echo "The parameters -q and -v may" \ - "not be used at the same time." - exit 2 - fi - ;; - -? | --*) - echo "Unknown parameter \"$option\"." - exit 1 - ;; - -*) - readParams "${option%${option#-?}}" - readParams "-${option#-?}" - ;; - *) - packages="$packages${packages:+$IFS}$option" - ;; - esac - } -} - -# -# Display a short help message. -# -printHelp() { - echo "$name v$version -usage: $name [-a] [-c] [-h] [-jN] [-m] [-n] [-o] [-q] [-r] [-R] [-v] [packages]" - exit 0 -} - -# Create the expression to match to find files linking against compat libraries. -# This can be emptied by readParams to deactivate that feature. -prefix="$(make -f /usr/share/mk/bsd.port.mk -VPREFIX 2> /dev/null || \ - echo '%%PREFIX%%')" -compat="=> $prefix/lib/compat|" - -# Create the semaphore with CPU cores * 2 jobs. -semaphoreCreate jobs "$(($(sysctl -n hw.ncpu 2> /dev/null || echo 1) * 2))" -# Register the status lock. -lockRegister status - -# Read the parameters. -readParams "$@" - -statusSet 'Preparing ...' - -# Get the packages to work on. -test -z "$packages" && packages="-a" -if [ -n "$pkgng" ]; then - packages="$(pkg info -q $packages)" - test -z "$recursive" -a -z "$Recursive" || packages="$packages - $(pkg info -q $recursive $Recursive "$packages" 2> /dev/null | \ - sed -E 's|^@pkgdep[[:space:]]*||1')" -else - packages="$(pkg_info -E $packages)" - test -z "$recursive" -a -z "$Recursive" || packages="$packages - $(pkg_info -q $recursive $Recursive "$packages" 2> /dev/null | \ - sed -E 's|^@pkgdep[[:space:]]*||1')" -fi - -# Create the regexp to match ldd output -match_expr="$compat=> not found|dependency .+ not found" - -# The packages to check. -package_amount="$(echo "$packages" | wc -l | sed 's|[[:space:]]||g')" -package_num=0 - -# Check each selected package. -for package in $packages; { - package_num="$(($package_num + 1))" - if [ -n "$pkgng" ]; then - test $origin \ - && package_name="$(pkg info -qo "$package")" \ - || package_name="$package" - else - test $origin \ - && package_name="$(pkg_info -qo "$package")" \ - || package_name="$package" - fi - - # Print what we're doing. - statusSet "Starting job $package_num of $package_amount: $package_name" - - semaphoreUse jobs - ( - # Remember freeing the semaphore. - trap 'semaphoreFree jobs' EXIT - - files="" - if [ -n "$pkgng" ]; then - files="$(pkg info -lq "$package")" - else - files="$(pkg_info -qL "$package")" - fi - # Get the programs libraries in case it doesn't use the - # operating system to find its libraries. - libraries="$(echo "$files" | grep -E '\.so[\.0-9]*$')" - - outdated=0 - broken= - - # Check each file of each package. - for file in $files; { - if [ ! -L "$file" -a \( \ - -x "$file" -o \ - -n "$(echo "$file" | grep -E '\.so[\.0-9]*$')" \ - \) ]; then - if dependencyMissing "$file"; then - if [ -n "$raw" ]; then - statusPrint "$package_name" - break 1 - fi - fi - fi - } - ) & -} - -semaphoreCountDown jobs "Waiting for %d remaining jobs to finish." -statusSet -lockUnregisterAll - -exit 0 diff --git a/ports-mgmt/bsdadminscripts/files/pkg_upgrade.in b/ports-mgmt/bsdadminscripts/files/pkg_upgrade.in deleted file mode 100644 index df50669e6ed4..000000000000 --- a/ports-mgmt/bsdadminscripts/files/pkg_upgrade.in +++ /dev/null @@ -1,2239 +0,0 @@ -#!/bin/sh -f -# -# Copyright (c) 2009 -# Dominic Fandrey <kamikaze@bsdforen.de> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -readonly version=1.1 -readonly name=pkg_upgrade - -# Error table. -readonly ERR_LOCK=1 -readonly ERR_ARG=2 -readonly ERR_INDEX=3 -readonly ERR_FETCH=4 -readonly ERR_SORT=5 -readonly ERR_BACKUP_MISS=6 -readonly ERR_BACKUP_UNKNOWN=7 -readonly ERR_INSTALL=8 -readonly ERR_USER=9 -readonly ERR_TERM=10 -readonly ERR_PACKAGE_FORMAT=11 -readonly ERR_CONFLICT=12 - -# Constant assignments. -readonly logfile="%%VAR%%/log/$name.log" -readonly pid=$$ - -# Get some environment variables from uma. This includes PACKAGESITE, -# TMPDIR and PKG_INDEX. -eval "$(uma env $pid)" - -# The remote package repository, derived from PACKAGESITE. -# If this matches the PACKAGES environment variable all downloading operations -# will be omitted. -readonly packagerepos="${PACKAGESITE%/*?}" - -# Environment variables. -: ${PACKAGES="$(make -V PACKAGES -f /usr/share/mk/bsd.port.mk 2> /dev/null)"} -PACKAGES="${PACKAGES:-%%PORTS%%/packages}" -: ${PKG_DBDIR=%%VAR%%/db/pkg} -: ${TMPDIR=%%TMP%%} -: ${PKG_TMPDIR=$TMPDIR} - -# This is where backup packages will be stored. -readonly packagebackup="$PACKAGES/$name-backup" -# This is where the download manager will listen for messages. -readonly queueMessages="$TMPDIR/pkg_upgrade.messages.queue" - -# Export environment variables to ensure that every tool uses the same ones. -export ARCH PACKAGEROOT PACKAGESITE FTP_TIMEOUT PKG_INDEX -export PACKAGEROOT_MIRRORS PACKAGESITE_MIRRORS -export PACKAGES PKG_DBDIR TMPDIR PKG_TMPDIR - -# Direct index access. -readonly IDX_PKG=0 -readonly IDX_ORIGIN=1 -readonly IDX_PREFIX=2 -readonly IDX_COMMENT=3 -readonly IDX_DESCRIPTION=4 -readonly IDX_MAINTAINER=5 -readonly IDX_CATEGORIES=6 -readonly IDX_DIRECTDEPENDS=7 -readonly IDX_DEPENDS=8 -readonly IDX_WWW=9 -readonly IDX_PERLVERSION=10 -readonly IDX_PERLMODULES=11 - -# Input field seperator without spaces. -IFS=' -' - -# Parameter flags. -pAll= -pNoBackup= -pClean= -pExitOnConflict= -pForce= -pFetchOnly= -pInteractive= -pJobs= -pListDiscarded= -pNoActions= -pNoLogging= -pParanoid= -pRecursive= -pReplaceConflicts= -pMoreRecursive= -pUpwardRecursive= -pMoreUpwardRecursive= -pVerbose= - -# The categories for packages. -older= -newer= -unindexed= -multiple= -error= - -# A cache for the pkgDepends function. -dependsChecked= - -# The names of packages that do not have a verified download. -pending= - -# -# The list of packages to upgrade. -# - -# <origin>;<newPackage> -upgrade= -upgradeDepends= -upgradeDepending= - -# The <newOrgin>;<newPackage> part can also be found in $upgrade. -# <newOrigin>;<newPackage>|<oldOrigin>;<oldPackage> -replace= - -# A list of dependency substitutions for new packages. -# <originalOrigin>;<originalName>|<newDependencyOrigin>;<newDependencyName> -substituteDepends= - -# The current status line. -status= - -# The ports directory as used in the index file. -idxports= - -# -# Table Of Functions -# In order of appearance. -# -# getIndex() Fetch the latest INDEX -# getLock() Acquire a lock -# printStatus() Print status messages on the terminal -# error() Terminate with an error message -# warn() Print a warning on stderr -# verbose() Print a message, but only in verbose mode -# log() Log activity into a log file -# getIdxEscape() Escape origins and packages for regular expressions -# getIdxRows() Filter index rows with an escaped expression -# getIdxRowsEscaped() Filter index rows with an expression -# getIdxColumn() Get a certain column from index rows -# pkgAll() Make a list of outdated packages -# pkgDepends() Check dependencies -# pkgDepending() Check upwards dependencies -# pkgDependencies() Run all dependency checks -# printProgress() Print numerical progress output -# pkgSort() Sort packages by dependency -# printTask() Print the tasks to perform for a package -# pkgList() List all tasks in 'no actions' mode -# pkgDownload() Download all required packages -# pkgUpgrade() Upgrade all scheduled packages -# substituteDepends() Adjust dependencies of upgraded packages -# upgradePackage() Upgrade a given package -# identifyPackage() Identify a package by a user given string -# printHelp() Print program parameters and terminate -# readParams() Read the command line parameters -# readContents() Read the +CONTENTS of a package file -# downloadManager() Start a background download manager -# downloadManagerFetch() -# Try to fetch a package from a mirror -# downloadManagerMsgRetry() -# Tell the download manager to retry a download -# downloadManagerMsgFinished() -# Tell the download manager a download has been completed -# downloadManagerMsgRequest() -# Request a download from the download manager -# downloadManagerMsgExit() -# Tell the download manager to terminate -# validatePackage() Validate a downloaded package -# - - -# -# Update the local copy of the index and start the download manager. -# -# @param idxports -# This is set to the ports directory used in the index file. This is -# required for many index operations. If already set the index is -# assumed to be up to date and nothing is done. -# @param pVerbose -# Activate verbose output. -# -getIndex() { - # The index has already been updated. - if [ -n "$idxports" ]; then - return 0 - fi - - # Free the lock upon termination. - trap "uma unlock $pid" EXIT - - # First acquire the lock. - getLock - - verbose "Synchronize the local index copy with the package server." - - # Try to update the index. - if ! uma $pVerbose fetch ftpindex $pid; then - exit $ERR_INDEX - fi - - # Set the ports directory used in the index. - idxports="$(getIdxColumn $IDX_ORIGIN "$(head -n 1 "$PKG_INDEX")")" - idxports="${idxports%/*/*}" - - # Start the download manager. - downloadManager -} - -# -# Acquires the uma (Update Manager) lock. And spawns a process that locks -# onto PKG_DBDIR to block the ports from messing with us. -# -getLock() { - # Acquire the lock. - if ! uma lock $pid; then - if [ "$USER" != "root" ]; then - error $ERR_LOCK "The command $name has to be run as root." - else - error $ERR_LOCK "The uma (Update MAnager) lock could not be acquired, it appears the package/ports infrastructure is in use." - fi - fi - - # Lock onto PKG_DBDIR to avoid ports getting into our way. - # The ports tree locks onto PKG_DBDIR during install and deinstall. - # Since it does not use uma we use this lock to make sure the ports - # tree does not get into our way later. - if ! lockf -kst 0 "$PKG_DBDIR" sh -c "lockf -k '$PKG_DBDIR' sh -c 'while kill -0 $pid 2> /dev/null; do sleep 2; done' &"; then - error $ERR_LOCK "Locking $PKG_DBDIR failed, the ports tree might be in use." - fi -} - -# -# Prints a status message to the terminal device /dev/tty. -# -# @param 1 -# The message to print -# @param status -# The last printed message, used for clearing the status line before -# printing a new status. -# @param pClean -# If set, do not print status messages. -# -printStatus() { - test -n "$pClean" && return 0 - printf "\r%${#status}s\r%s\r" '' "$1" > /dev/tty - status="$1" -} - -# -# Exits with the given error and message on stderr. -# -# @param 1 -# The error number to exit with. -# @param 2 -# The message to exit with. -# -error() { - # Clear the status line. - printStatus - echo "$name: $2" 1>&2 - exit "$1" -} - -# -# Writes a warning message to stderr. -# -# @param 1 -# The message to write. -# -warn() { - # Clear the status line. - printStatus - echo "$name: $1" 1>&2 -} - -# -# Outputs verbose messages on stdout. -# -# @param @ -# All the parameters to be output. -# @param pVerbose -# If this is not set, do not output anything. -# -verbose() { - test -z "$pVerbose" && return 0 - echo "$@" -} - -# -# Logs the given message into a log file. -# -# The following format is used. -# -# <UTC timestamp> - <date> - (<error>|DONE): <message> -# -# UTC timestamp := The output of 'date -u '+%s' -# date := The output of 'date' -# -# @param 1 -# The error number for the log, if this is 0, the message will be -# preceded by "DONE:" instead of "ERROR($1):". -# @param 2 -# The message to log. -# @param logfile -# The name of the file to log into. -# @param pNoLogging -# If set, logging is not performed. -# -log() { - test -n "$pNoLogging" && return 0 - - if [ $1 -eq 0 ]; then - echo "$(date -u '+%s') - $(date) - DONE: $2" >> $logfile - else - echo "$(date -u '+%s') - $(date) - ERROR($1): $2" >> $logfile - fi -} - -# -# An escape function for package names fed to the getIdxColumn function. -# This function reads from the standard input unless a file is named -# in the parameters. -# Note that the escaping is done for extended regular expressions, however -# only characters that can appear in package names are escaped. -# -# @param @ -# More parameters can be added to the sed command. -# -getIdxEscape() { - sed -E -e 's/([+.])/\\\1/g' "$@" -} - -# -# Outputs all rows of the index that match a given pattern in a column. -# The pattern should not match '|'. -# -# @param 1 -# The column that has to match the pattern. -# @param 2 -# The pattern that has to be matched, an extended regular expression. -# @param 3 -# Optional, the rows to match against instead of using the index file. -# -getIdxRows() { - if [ -z "$3" ]; then - grep -E "^([^|]*\|){$1}($2)(\|.*)?\$" "$PKG_INDEX" - else - echo "$3" | grep -E "^([^|]*\|){$1}($2)(\|.*)?\$" - fi -} - -# -# Outputs all rows of the index that match a given string. -# The string should not contain '|'. -# -# @param 1 -# The column that has to match the string. -# @param 2 -# The string that has to be matched. -# @param 3 -# Optional, the rows to match against instead of using the index file. -# -getIdxRowsEscaped() { - getIdxRows $1 "$(echo "$2" | getIdxEscape)" "$3" -} - -# -# Outputs a column of each index row piped into it. -# -# @param 1 -# The column to output. -# @param 2 -# The rows to output the columns from. -# -getIdxColumn() { - echo "$2" | sed -E "s,^([^|]*\|){$1}([^|]*)\|.*,\2,1" -} - -# -# Stores all the packages not in sync with the index file in categories. -# -# @param older -# The list of packages older than those in the index. -# @param newer -# The list of packages newer than those in the index. -# @param unindexed -# The list of packages not in the index. -# @param multiple -# The list of packages that have multiple index entries. -# @param error -# The list of packages with broken package database entries. -# @param pForce -# If set, register all installed packages in the index as outdated. -# @param pAll -# If set, add all outdated packages to the list of packages to upgrade. -# @param pListDiscarded -# If set, list all the packages that are ignored. -# @param upgrade -# The list to add packages to if pAll is set. -# -pkgAll() { - local package pkgname origin operator row discarded - - # There's nothing to be done if all of the following conditions are - # met: - # - Nothing is yet listed for upgrading, so we do not need a list - # of outdated packages for dependency checking. - # - The updating of all packages is not requested. - # - The listing of ignored (i.e. not indexed) packages is not - # requested. - test -z "$upgrade" -a -z "$pAll" -a -z "$pListDiscarded" && return 0 - - verbose "Make a list of outdated packages." - - printStatus "Reading version information of installed packages ..." - - if [ -n "$pForce" ]; then - # In force mode it is assumed that all installed packages to - # be found in the index are outdated. - for package in $(pkg_version -Io "${PKG_INDEX}"); { - origin="${package%% *}" - row="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin")" - pkgname="$(getIdxColumn $IDX_PKG "$row")" - printStatus "Checking <$pkgname>." - operator="${package##* }" - case "$operator" in - '?') - unindexed="$unindexed${unindexed:+$IFS}$origin" - ;; - '!') - error="$error${error:+$IFS}$origin" - ;; - *) - older="$older${older:+$IFS}$origin;$pkgname" - ;; - esac - } - else - # Categorize installed packages and their relations to the - # index. - for package in $(pkg_version -IoL = ${PKG_INDEX}); { - origin="${package%% *}" - row="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin")" - pkgname="$(getIdxColumn $IDX_PKG "$row")" - printStatus "Checking <${pkgname:-$(pkg_info -qO $origin)}>." - operator="${package##* }" - case "$operator" in - '<') - older="$older${older:+$IFS}$origin;$pkgname" - ;; - '>') - newer="$newer${newer:+$IFS}$origin;$pkgname" - ;; - '?') - unindexed="$unindexed${unindexed:+$IFS}$origin" - ;; - '*') - multiple="$multiple${multiple:+$IFS}$origin" - ;; - '!') - error="$error${error:+$IFS}$origin" - ;; - esac - } - fi - - printStatus "Assemble checked packages ..." - - # Remove packages to upgrade from the list of outdated packages. - for package in $upgrade; { - older="$(echo "$older" | grep -vx "$package")" - } - - # Append outdated packages to the list of packages to update if all - # packages are to be updated. - if [ -n "$pAll" ]; then - downloadManagerMsgRequest "$older" - upgrade="$upgrade${older:+${upgrade:+$IFS}}$older" - older= - fi - - # Clear the status line. - printStatus - - # Print the discarded packages. - if [ -n "$pListDiscarded" ]; then - verbose "List discarded packages." - - discarded="$unindexed$IFS$multipleIFS$error" - discarded="$(echo "$discarded" | grep -vFx '' | sort -u)" - - test -n "$discarded" && echo "$discarded" - fi -} - -# -# Adds all missing dependencies to the list of packages to upgrade. -# -# @param 1 -# This is used to check the dependencies of newly added depending -# packages. -# @param upgrade -# The primary list of packages to upgrade (read only). -# @param upgradeDepends -# The list to add packages to upgrade to. -# @param older -# The list of outdated packages. Packages for upgrading are removed from -# it. -# @param dependsChecked -# A list of already checked dependencies, to avoid double checks. -# @param pRecursive -# If set, also add outdated dependencies to the upgrade list. -# @param pMoreRecursive -# If set, also update the dependencies of depending packages. -# @param pForce -# If set together with pRecursive, add all dependencies to the upgrade -# list. -# -pkgDepends() { - local pkgname package row rows depends origin escapedPkg upgradeList - - printStatus "Preparing dependency checks ..." - - # In thorough mode the depencies of depending packages are updated, too. - upgradeList="${1:-$upgrade}" - - # Luckily packages know their indirect dependencies, too. This way - # it is not necessary to check for dependencies recursively. - depends= - for package in $upgradeList; { - row="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/${package%;*}")" - row="$(getIdxColumn $IDX_DEPENDS "$row")" - depends="$depends${depends:+${row:+ }}$row" - } - - # Reformat depends and throw out duplicates. - depends="$( - echo "$depends" | sed "s/ /\\$IFS/g" | sort -u - )" - - # Do some prefiltering. - rows="$(getIdxRowsEscaped $IDX_PKG "$(echo "$depends" | rs -TC\|)")" - - # Check for missing or outdated dependencies. - for pkgname in $depends; { - escapedPkg="$(echo "$pkgname" | getIdxEscape)" - - # Skip packages already checked. - if echo "$dependsChecked" | grep -qFx "$pkgname"; then - continue - fi - dependsChecked="$dependsChecked${dependsChecked:+$IFS}$pkgname" - - printStatus "Check dependency <$pkgname>." - - # Skip this if this package is already scheduled for updating. - if echo "$upgrade${upgradeDepending:+$IFS$upgradeDepending}" | grep -qF ";$pkgname"; then - continue - fi - - row="$(getIdxRows $IDX_PKG "$escapedPkg" "$rows")" - - # If this package could not be identified this is an index - # incosistency, that can only be ignored. - if [ -z "$row" ]; then - warn "Ignore index inconsistency, the dependency <$pkgname> is not in the index." 1>&2 - continue - fi - - origin="$(getIdxColumn $IDX_ORIGIN "$row")" - origin="${origin#$idxports/}" - package="$origin;$(getIdxColumn $IDX_PKG "$row")" - - # - # Deal with dependencies according to set parameters. - # - if [ -z "$(pkg_info -qO "$origin")" ]; then - # The depency is not installed. - upgradeDepends="$upgradeDepends${upgradeDepends:+$IFS}$package" - # Request a package download. - downloadManagerMsgRequest "$package" - elif [ -n "$pMoreRecursive" -o -n "$pRecursive" -a -z "$1" ]; then - # Check whether the dependency is outdated. - if echo "$older" | grep -qFx "$package"; then - upgradeDepends="$upgradeDepends${upgradeDepends:+$IFS}$package" - older="$(echo "$older" | grep -vFx "$package")" - # Request a package download. - downloadManagerMsgRequest "$package" - fi - fi - } -} - -# -# Checks whether packages depending on the packages to update require updating. -# -# @param 1 -# This is used to check the depending packages of newly added -# dependencies. -# @param older -# The list of outdated packages. If pForce is set, this includes all -# installed packages listed in the index. -# @param upgrade -# The primary list of packages to upgrade (read only). -# @param upgradeDepending -# The list of depending packages to upgrade. -# @param pUpwardRecursive -# If not set nothing is done. -# @param pMoreUpwardRecursive -# Also check the depending packages of depencencies. -# @param pAll -# If this is set do nothing. -# -pkgDepending() { - # Without the upwardRecursive option this is completely - # unnecessary. - if [ -z "$pUpwardRecursive" ]; then - return 0 - fi - - # If all packages are already going to be upgraded, there is no - # need for this. - if [ -n "$pAll" ]; then - return 0 - fi - - # Only update depending packages of dependencies in thorough mode. - if [ -n "$1" -a -z "$pMoreUpwardRecursive" ]; then - return 0 - fi - - local package pkgname origin row depends escapedPkg upgradeList - - printStatus "Preparing upwards dependency checks ..." - - # In thorough mode the depencies of depending packages are updated, too. - upgradeList="${1:-$upgrade}" - - # Do some prefiltering. - rows="$(getIdxRowsEscaped $IDX_ORIGIN "$( - echo "$older" | rs -TC\| | sed -E "s'([^;|]*);[^|]*'$idxports/\1'g" - )")" - - # For each outdated package, check whether it depends on a package - # to upgrade. In force mode outdated packages are all packages, so - # the difference does not have to be made here. - for package in $older; { - # Skip this if this package is already scheduled for updating. - if echo "$upgrade${upgradeDepends:+$IFS$upgradeDepends}${upgradeDepending:+$IFS$upgradeDepending}" | grep -qFx "$package"; then - continue - fi - - printStatus "Check for upwards dependency <${package#*;}>." - - origin="${package%;*}" - row="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin" "$rows")" - - # Ignore unindexed packages. - if [ -z "$row" ]; then - continue - fi - - depends="$(getIdxColumn $IDX_DEPENDS "$row")" - - # It has no dependencies, so it cannot depend on anything - # in the upgrade list. - if [ -z "$depends" ]; then - continue - fi - - # Reformat dependencies. - depends="$(echo "$depends" | sed -Ee "s/([^ ]+)/;\1/g" -e "s/ /\\$IFS/g")" - - # Check every dependency for matching the upgrade packages. - if echo "$upgradeList" | grep -qF "$depends"; then - upgradeDepending="$upgradeDepending${upgradeDepending:+$IFS}$package" - older="$(echo "$older" | grep -vFx "$package")" - downloadManagerMsgRequest "$package" - fi - } -} - -# -# This function calls pkgDepending and pkgDepends until no new packages -# show up for updating. All the clever stuff happens in those functions. -# -# @param upgrade -# The list of packages to upgrade. -# @param upgradeDepends -# The list of dependencies to add to the list of packages to upgrade. -# @param upgradeDepending -# The list of depending packages to add to the list of packages -# to upgrade. -# -pkgDependencies() { - test -z "$upgrade" && return 0 - - verbose "Perform dependency checks." - - # Run the primary dependency checks. - pkgDepending - downloadManagerMsgRequest "$upgradeDepending" - pkgDepends - downloadManagerMsgRequest "$upgradeDepends" - - # The idea is to keep on checking until nothing new shows up. - # Whether that is the case depends on the level of recursiveness. - while [ -n "$upgradeDepends$upgradeDepending" ]; do - if [ -n "$upgradeDepends" ]; then - # Deal with packages depending on the updated packages. - pkgDepending "$upgradeDepends" - upgrade="$upgradeDepends$IFS$upgrade" - upgradeDepends= - fi - - if [ -n "$upgradeDepending" ]; then - # Deal with missing or outdated dependencies. - pkgDepends "$upgradeDepending" - upgrade="$upgrade$IFS$upgradeDepending" - upgradeDepending= - fi - done - - # Clear the status line. - printStatus -} - -# -# Prints a progress message to the terminal device /dev/tty. -# -# @param 1 -# Total amount of operations to do. -# @param 2 -# The amount of operations performed. -# @param 3 -# The name of the package that is currently operated on. -# @param 4 -# The text prepending the progress information. -# @param status -# The last printed message, used for clearing the status line before -# printing a new status. -# @param pClean -# If set, do not print progress messages. -# -printProgress() { - test -n "$pClean" && return 0 - printf "\r%${#status}s\r$4 %${#1}s of %${#1}s (%3s%%) <$3>.\r" '' "$2" "$1" "$(($2 * 100 / $1))" > /dev/tty - status="$4 $1 of $1 (100%) <$3>." -} - -# -# Sorts the packages to upgrade by dependency. -# -# The trick is to have a list of already sorted packages. Each package added -# to the list is inserted right behind its last dependency already present -# there. -# Packages without any dependencies in the sorted list are prepended. This -# way it is ensured that they end up before all already sorted packages -# that depend on them, without additional checking. -# -# @param upgrade -# The list of packages to sort. -# @param pParanoid -# If set, make cyclic dependency checks. -# -pkgSort() { - local rows sorted package row depends dependency pkgname - local totalCount count - - test -z "$upgrade" && return 0 - - verbose "Sort packages by dependency." - - printStatus "Prepare sorting of packages ..." - - # Limit rows to whatever is currently required. - rows="$(getIdxRowsEscaped $IDX_ORIGIN "$( - echo "$upgrade" | getIdxEscape -e 's/;.*//1' -e "s,^,$idxports/,1" | rs -TC\| - )")" - - # The number of packages - totalCount=$(($(echo "$upgrade" | wc -l))) - count=0 - - # Sort each package into the list of sorted packages. - sorted= - for package in $upgrade; { - count=$(($count + 1)) - pkgname="${package#*;}" - printProgress $totalCount $count "$pkgname" 'Sort' - - # Get the list of dependencies that should be updated before - # the current package. - row="$(getIdxRowsEscaped $IDX_PKG "$pkgname" "$rows")" - depends="$(getIdxColumn $IDX_DEPENDS "$row" | sed -E "s/ /\\$IFS/g")" - - # Get the last matching dependency in the list. - dependency="$(echo "$sorted" | grep -Fx "$depends" | tail -n 1)" - - # If there is no match, just prepend to the list. - if [ -z "$dependency" ]; then - sorted="$pkgname${sorted:+$IFS$sorted}" - continue - fi - - # Insert right behind the match. - dependency="$(echo "$dependency" | getIdxEscape)" - sorted="$(echo "$sorted" | sed -E "s/^$dependency$/$dependency\\$IFS$pkgname/1")" - } - - # Perform optional cyclic dependency check. - if [ -n "$pParanoid" ]; then - printStatus "Validate sorting order ..." - - # Validate the sort order. - count=0 - for pkgname in $sorted; { - count=$(($count + 1)) - printProgress $totalCount $count "$pkgname" 'Validate' - - # Get the list of dependencies that should be updated before - # the current package. - row="$(getIdxRowsEscaped $IDX_PKG "$pkgname" "$rows")" - depends="$(getIdxColumn $IDX_DEPENDS "$row" | sed -E "s/ /\\$IFS/g")" - - # Append the package to the list of dependencies to match. - depends="${depends:+$depends$IFS}$pkgname" - - # Get the last match in the list. - dependency="$(echo "$sorted" | grep -Fx "$depends" | tail -n 1)" - # The last match has to be the package. - if [ "$dependency" != "$pkgname" ]; then - error $ERR_SORT "The package <$pkgname> was not sorted properly, a likely cause is a circular dependency." - fi - } - fi - - printStatus "Assemble sorted packages ..." - - # Replace package names with <origin>;<package> pairs. - for package in $upgrade; { - pkgname="$(echo "${package#*;}" | getIdxEscape)" - sorted="$(echo "$sorted" | sed -E "s'^$pkgname\$'$package'1")" - } - - upgrade="$sorted" - printStatus -} - -# -# Prints the update/replace/install task. -# -# @param 1 -# The package to upgrade/install. -# @param replace -# The list of packages to replace. -# -printTask() { - local package newPkgname newOrigin oldPkgname oldOrigin - - # Get the name and origin of the new package. - newPkgname="${1#*;}" - newOrigin="${1%;*}" - - # Look for a package the new one replaces. - package="$(echo "$replace" | grep -F "$1|")" - - # Look for a package this one replaces. - # The current package actually replaces another one. - if [ -n "$package" ]; then - # Get the name and origin of the old package. - package="${package#*|}" - oldPkgname="${package#*;}" - oldOrigin="${package%;*}" - - echo "Replace <$oldPkgname> ($oldOrigin) with <$newPkgname> ($newOrigin)" - return 0 - fi - - # Check whether there's an old version of this package around. - package="$(pkg_info -qO "$newOrigin")" - - # An older package with this origin is installed. - if [ -n "$package" ]; then - echo "Update <$package> to <$newPkgname> ($newOrigin)" - return 0 - fi - - # Aparently this package will be newly installed. - echo "Install <$newPkgname> ($newOrigin)" -} - -# -# List the packages that are going to be upgraded, installed and replaced. -# If the 'no actions' mode is active. -# -# @param upgrade -# The list of packages to upgrade. -# @param pNoActions -# Print the list of tasks. -# -pkgList() { - # Only list packages in "no actions" mode. - test -z "$pNoActions" && return 0 - - test -z "$upgrade" && return 0 - - local package - - verbose "The following packages will be updated:" - - for package in $upgrade; { - printTask "$package" - } -} - -# -# Wait for downloaded packages and validate them. -# -# @param upgrade -# The list of packages to download. -# @param pending -# The list of pending downloads. -# @param packagerepos -# The location of the remote package repository (derived from -# PACKAGESITE). If this is identical with the local repository, -# the download manager was not started. -# @param pNoActions -# Do not download anything. -# -pkgDownload() { - test -n "$pNoActions" && return 0 - - test -z "$upgrade" && return 0 - - local package total count line - - verbose "Validate downloaded packages." - - printStatus "Waiting for downloads ..." - - # Create a list of the package names to validate. - # Entries are removed from this list by validatePackage(). - pending="$(echo "$upgrade" | sed 's/.*;//1')" - - # The total number of packages to validate. - total="$(($(echo "$upgrade" | wc -l)))" - - # Check whether the download manager is available. - if [ "$PACKAGES" = "$packagerepos" ]; then - # - # The local repository is identical with the remote repository - # so the assumption is all packages should already be there. - # - - # Validate all packages. - for package in $pending; { - count=$(($count + 1)) - printProgress $total $count "$package" "Validate" - validatePackage "$package" - } - else - # - # The download manager is available, so hang on to its message - # queue and proceed with validating as packages are finished. - # - count=0 - - while [ -n "$pending" ]; do - read line - case "$line" in - finished:*) - count=$(($count + 1)) - package="${line##*;}" - printProgress $total $count "$package" "Validate" - validatePackage "$package" - ;; - esac - done < "$queueMessages" - - # Stop the download manager. - downloadManagerMsgExit - fi - - # Clear the status line. - printStatus -} - -# -# Upgrade each package. -# -# @param upgrade -# The list of packages to upgrade. -# @param conflictReplace -# This list is reset for conflict handling. -# @param pNoActions -# Do not update anything. -# @param pFetchOnly -# Do not update anything. -# -pkgUpgrade() { - test -n "$pNoActions" -o -n "$pFetchOnly" && return 0 - - test -z "$upgrade" && return 0 - - local package - - verbose "Install $(($(echo "$upgrade" | wc -l))) package(s)." - - for package in $upgrade; { - upgradePackage "$package" - } -} - -# -# To handle conflicts this function removes dependencies from a given package -# and appends one or more new ones to take their place. Also the +REQUIRED_BY -# files of the appended dependencies are updated. -# -# @param 1 -# The name of the package to which to apply the substitutions. -# @param substituteDepends -# The list of dependency substitutions that should take place. -# -substituteDepends() { - # End here if there's nothing to substitute. - test -z "$substituteDepends" && return 0 - - local line originalOrigin originalPkgname newOrigin newPkgname - local contents append remove requiredBy - - printStatus "Adjust the dependencies of <$1> ..." - - # Get the contents file. - contents="$(cat "$PKG_DBDIR/$1/+CONTENTS")" - - # Because there can be several substitutions for a single package - # the new ones will be added to the end of the +CONTENTS file and all - # the matches will be removed later. - append= - remove= - for line in $substituteDepends; { - # Get original origin and package name from the line. - originalOrigin="${line%%;*}" - originalPkgname="${line%|*}" - originalPkgname="${originalPkgname#*;}" - - # Continue with the next line if this one does not match. - if ! echo "$contents" | grep -qFx "@pkgdep $originalPkgname"; then - continue - fi - - # Get new origin and package name from the line. - newOrigin="${line#*|}" - newPkgname="${newOrigin#*;}" - newOrigin="${newOrigin%;*}" - - warn "Add dependency <$newPkgname> ($newOrigin)." - - # Remember what to append and what to remove. - remove="${remove:+$remove$IFS}@pkgdep $originalPkgname$IFS@comment DEPORIGIN:$originalOrigin" - # Just for the very unlikely case that two dependencies get - # replaced for conflicting with the same package, check that - # a dependency is not added twice. - if ! echo "$append" | grep -qFx "@pkgdep $newPkgname"; then - append="$append$IFS@pkgdep $newPkgname$IFS@comment DEPORIGIN:$newOrigin" - fi - - # Make an entry for the package in the +REQUIRED_BY file of - # of the dependency to append. - requiredBy="$(cat "$PKG_DBDIR/$newPkgname/+REQUIRED_BY" 2> /dev/null)" - requiredBy="${requiredBy:+$requiredBy$IFS}$1" - echo "$requiredBy" | sort -u > "$PKG_DBDIR/$newPkgname/+REQUIRED_BY" - } - - # Remove the original dependency entries. - contents="$(echo "$contents" | grep -vFx "$remove")" - # Write the new file. Note that $append always starts with a newline. - echo "$contents$append" > "$PKG_DBDIR/$1/+CONTENTS" -} - -# -# Install the given package. This is where the magic happens. -# -# @param replace -# The list of packages to replace (read only). -# @param substituteDepends -# A list of dependency substitutions that should take place for each -# newly installed package to resolve conflicting packages. -# @param packagebackup -# The location for backup packages. This is derived from PACKAGES. -# @param pNoBackup -# If set, delete backups after successful completion. -# -upgradePackage() { - local task targetPackage targetPkgname targetOrigin package replace - local escapedPkg removePackages origin file conflict conflicting - local replacePkgdep requiredBy count - local signal - - # Get a string with the current upgrade task. - task="$(printTask "$1")" - echo "===> $task" - - targetPackage="$1" - targetPkgname="${1#*;}" - targetOrigin="${1%;*}" - - printStatus "Prepare installation of <$targetPkgname> ..." - - # Get the packages to replace with this one. Several packages can be - # replaced with a single one. - escapedPkg="$(echo "$targetPackage" | getIdxEscape)" - replace="$(echo "$replace" | grep -Ex "$escapedPkg\|.*" | sed -E "s'^$escapedPkg\|''1")" - - # Append the current package to the list of packages to replace. - replace="${replace:+$replace$IFS}$targetPackage" - - # Create the list of outdated packages that have to be backed up - # and for which pkgdb adjustments have to be made after successful - # installation of the new package. - # Also create the necessary sed expressions to update the - # package database. - removePackages= - replacePkgdep= - for package in $replace; { - origin="${package%;*}" - package="$(pkg_info -qO "$origin")" - test -z "$package" && continue - removePackages="$removePackages${removePackages:+$IFS}$package" - package="$(echo "$package" | getIdxEscape)" - replacePkgdep="$replacePkgdep -e 's|^@pkgdep $package\$|@pkgdep $targetPkgname|1'" - if [ "$origin" != "$targetOrigin" ]; then - replacePkgdep="$replacePkgdep -e 's|^@comment DEPORIGIN: $origin\$|@comment DEPORIGIN:$targetOrigin|1'" - fi - - } - - # Get a list of conflicting packages. The conflicts list is - # provided by readContents(). - readContents "$PACKAGES/All/$targetPkgname.tbz" - conflicting= - for conflict in $conflicts; { - # Match the conflict pattern against installed packages. - for conflict in $(pkg_info -E "$conflict"); { - escapedPkg="$(echo "$conflict" | getIdxEscape)" - # Only add to the conflicting list if the conflicting - # package is not in the list of packages to replace. - if ! echo "$removePackages" | grep -qEx "$escapedPkg"; then - conflicting="${conflicting:+$conflicting$IFS}$conflict" - fi - } - } - # Remove duplicated entries. - conflicting="$(echo "$conflicting" | sort -u)" - - # Check whether any conflicts were found. - if [ -n "$conflicting" ]; then - # What happens now depends on the user preferences. - if [ -n "$pExitOnConflict" ]; then - # The user has chosen to bail out when a conflict - # occurs. - log $ERR_CONFLICT "$task" - error $ERR_CONFLICT "The package <$targetPkgname> conflicts with the following packages:$IFS$conflicting" - elif [ -n "$pReplaceConflicts" ]; then - # The user has chosen that conflicting packages should - # be replaced as if they were explicitly listed for - # replacing. - conflicts= - for package in $conflicting; { - warn "The package <$package> conflicts with <$targetPkgname> and will be replaced." - removePackages="$removePackages${removePackages:+$IFS}$package" - origin="$(pkg_info -qo "$package")" - # The next line is just for prettier log output. - conflicts="${conflicts:+$conflicts, }<$package> ($origin)" - package="$(echo "$package" | getIdxEscape)" - replacePkgdep="$replacePkgdep -e 's|^@pkgdep $package\$|@pkgdep $targetPkgname|1'" - if [ "$origin" != "$targetOrigin" ]; then - replacePkgdep="$replacePkgdep -e 's|^@comment DEPORIGIN: $origin\$|@comment DEPORIGIN:$targetOrigin|1'" - fi - } - log 0 "Conflict <$targetPkgname> ($targetOrigin) remove package(s) $conflicts" - else - # The default action is to assume that the conflicting - # packages fulfill the required functionality. - conflicts= - for package in $conflicting; { - warn "The package <$targetPkgname> will not be installed in favour of <$package>, because they conflict." - origin="$(pkg_info -qo "$package")" - # Record the necessary substitutions. - # TODO: Later versions will have to store this - # for resume. - substituteDepends="${substituteDepends:+$substituteDepends$IFS}$targetPackage|$origin;$package" - # This is just for prettier log output. - conflicts="${conflicts:+$conflicts, }<$package> ($origin)" - } - # Log the conflict resolution. - log 0 "Conflict <$targetPkgname> ($targetOrigin) favour package(s) $conflicts" - # Skip to the next package. - return 0 - fi - fi - - # Backup packages. - mkdir -p "$packagebackup" - for package in $removePackages; { - printStatus "Backup <$package>." - pkg_create -b "$package" "$packagebackup/$package" - case $? in - 0) - # Everything went well. - ;; - 1) - # If this happens someone's been messing with - # the packages just milliseconds ago. - log $ERR_BACKUP_MISS "$task" - error $ERR_BACKUP_MISS "The backup of <$package> failed. The package is missing." - ;; - 2) - # Fortunately pkg_create backs up as much as - # as is possible. That the backup (and hence - # the present package) is incomplete is all - # the more reason to upgrade. - # I do not understand why portmaster is - # interactive in this case. - warn "Ignoring incomplete backup of <$package>." - ;; - *) - # Well, I've got no idea at all what else - # could go wrong. Too bad the return codes - # of pkg_create are not documented. - log $ERR_BACKUP_UNKNOWN "$task" - error $ERR_BACKUP_UNKNOWN "The backup of <$package> failed for unknown reasons." - ;; - esac - } - - # Block SIGINT (CTRL-C), because that would really wrack havoc upon - # the package database in the following section. - signal= - trap "signal=$ERR_USER" sigint - trap "signal=$ERR_TERM" sigterm - - # Delete packages. - requiredBy= - count=-1 - for package in $removePackages; { - printStatus "Delete <$package>." - # Remember +REQUIRED_BY contents for roll-back. - count=$(($count + 1)) - local "requiredBy$count" - setvar "requiredBy$count" "$(cat "$PKG_DBDIR/$package/+REQUIRED_BY" 2> /dev/null)" - # Remember +REQUIRED_BY contents for the new package. - requiredBy="${requiredBy:+$requiredBy$IFS}$(cat "$PKG_DBDIR/$package/+REQUIRED_BY" 2> /dev/null)" - # Finally delete the package. - pkg_delete -f "$package" - } - - # Update the package database. - printStatus "Update package database for <$targetPkgname>." - if [ -n "$replacePkgdep" ]; then - for file in $(find "$PKG_DBDIR" -name '+CONTENTS'); { - eval "sed -Ei '.$name' $replacePkgdep '$file'" - } - fi - - # If an old version of this package was favoured in a conflict, - # the substituteDepends list has to be changed. - substituteDepends="$(echo "$substituteDepends" | sed "s'\|$targetOrigin;.*'|$targetPackage'1")" - - # Try to install the new package. - printStatus "Install <$targetPkgname>." - if ! env PKG_PATH="$PACKAGES/All" pkg_add -f "$targetPkgname"; then - # Installation went wrong, roll back! - printStatus "Roll back changes for <$targetPkgname>." - for file in $(find "$PKG_DBDIR" -name "*.$name"); { - mv -f "$file" "${file%.$name}" - } - count=-1 - for package in $removePackages; { - # Restore package. - env PKG_PATH="$packagebackup" pkg_add -f "$package" - # Recover +REQUIRED_BY file. - count=$(($count + 1)) - eval "echo \"\$requiredBy$count\"" > "$PKG_DBDIR/$package/+REQUIRED_BY" - # Remove the backup if set. - test -n "$pNoBackup" && rm "$packagebackup/$package.tbz" - } - log $ERR_INSTALL "$task" - error $ERR_INSTALL "The installation of <$targetPkgname> failed." - fi - - # Add the +REQUIRED_BY contents of all deleted packages to the - # +REQUIRED_BY file of the new one. - requiredBy="$(echo "$(cat "$PKG_DBDIR/$targetPkgname/+REQUIRED_BY" 2> /dev/null)$IFS$requiredBy" | grep -vFx '' | sort -u)" - echo "$requiredBy" > "$PKG_DBDIR/$targetPkgname/+REQUIRED_BY" - - # Make dependency substitutions from conflict resolving. - substituteDepends "$targetPkgname" - - # Log successful completion of the task. - log 0 "$task" - - # Remove backups if set. - if [ -n "$pNoBackup" ]; then - for package in $removePackages; { - printStatus "Remove backup of <$package>." - rm "$packagebackup/$package.tbz" - } - fi - - # Remove package database backups. - # TODO: Later versions will instead store them to allow a rollback. - printStatus "Remove database backups for <$targetPkgname>." - find "$PKG_DBDIR" -name "*.$name" -exec rm \{\} \; - - # Clear the status line. - printStatus - echo "=> $task succeeded" - - # Bail out if SIGINT or SIGTERM were encountered. - if [ -n "$signal" ]; then - error $signal "The process was interrupted." - fi - - # Reactivate default signal handlers. - trap - sigint sigterm -} - -# -# Identify the package by a given string. Outputs the origin of all matched -# packages, as well as the package name of the newest available package. -# The output is in the following shape: -# <origin>;<package> -# -# The shell wildcards '*' and '?' are supported. -# Origin and package names with wildcards are matched against installed -# packages. Unambiguous package names and origins are matched against the -# index. -# -# @param 1 -# The package identifier to find matches for. -# -identifyPackage() { - local packages package mangledPackage rows matchingRows mangledRows - local origins origin guess escapedPkg - - # Check for wildcards. - guess= - if echo "$1" | grep -qE '\*|\?|\[.*]'; then - guess=1 - fi - package="$1" - - # Distuinguish between origins and packages. - case "$package" in - */*) - # An origin has been given. - if [ -n "$guess" ]; then - # Wildcards present, match against installed - # packages. - - # Get all matching packages. - packages="$(pkg_info -qO "$package")" - - # Convert for use in a regular expression. - package="$(echo "$package" | getIdxEscape -e 's/\*/[^|]*/g' -e 's/\?/[^|]/g')" - # Get rows matching the given package origin. - # This is a performance tweak, so the whole - # index will not have to be parsed in the - # following output loop. - rows="$(getIdxRows $IDX_ORIGIN "$idxports/$package")" - - # Output all matching packages. - for package in $packages; { - # Get the origin. - origin="$(pkg_info -qo "$package")" - - # Match this package origin against the - # previously filtered rows. - package="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin" "$rows")" - # Get the package name of the newest - # package from the index. - package="$(getIdxColumn $IDX_PKG "$package")" - # Output origin/package pair. - echo "$origin;$package" - } - - # If no matches have been found, terminate. - if [ -z "$packages" ]; then - error $ERR_ARG "Package origin <$package> not matched by any installed package!" 1>&2 - fi - else - # There is an unambigious origin, match it - # against the index. - origin="$package" - # Get the index row. - rows="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin")" - # Get the package name column. - package="$(getIdxColumn $IDX_PKG "$rows")" - # Output origin/package pair, if a package for - # the given origin was found. - if [ -n "$package" ]; then - # Output origin/package pair. - echo "$origin;$package" - else - error $ERR_ARG "Package origin <$origin> not in index!" 1>&2 - fi - fi - ;; - *) - # A package name has been given. - if [ -n "$guess" ]; then - # Wildcards present, match against installed - # packages. - - # Get the origins of matching packages. - origins="$(pkg_info -qo "$package")" - - # Prepare the package name for use in a - # regular expression. - package="$(echo "$package" | getIdxEscape -e 's/\*/[^|]*/g' -e 's/\?/[^|]/g')" - # Get rows matching the given package name. - # This is a performance tweak, so the whole - # index will not have to be parsed in the - # following output loop. - rows="$(getIdxRows $IDX_PKG "$package")" - # Output all matching packages. - for origin in $origins; { - # Get the index row for this origin. - package="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin" "$rows")" - # Get the latest package name from the - # index. - package="$(getIdxColumn $IDX_PKG "$package")" - # Output origin/package pair. - echo "$origin;$package" - } - - # If no matches have been found, terminate. - if [ -z "$origins" ]; then - error $ERR_ARG "Package identifier <$package> not matched!" 1>&2 - fi - else - # A package name without wildcards has been - # given. This is expected to either be an exact - # package name or a LATEST_LINK name. - - # TODO: This would be much better if - # LATEST_LINK was known. This is information - # simply missing in the index. - # To make up for this some guessing is done in - # case of no matches or more than one match. - # But this fails for apache13 and probably - # other packages as well. - - # First try whether it is the current version - # of a package. - origin="$(pkg_info -qo "$package" 2> /dev/null)" - if [ -n "$origin" ]; then - # Get the matching index rows. - rows="$(getIdxRowsEscaped $IDX_ORIGIN "$idxports/$origin")" - fi - - # If it's not a current version, match against - # the index. - if [ -z "$rows" ]; then - # Get the matching rows. This should be - # only one, but it won't be for ports - # that define a proprietary LATEST_LINK. - escapedPkg="$(echo "$package" | getIdxEscape)" - rows="$(getIdxRows $IDX_PKG "$escapedPkg(-[^-]+)?")" - fi - - # No match, start some guessing. - # This fails for packages with a version tail, - # which is just what is wanted. - if [ -z "$rows" ]; then - # Assume this is a LATEST_LINK kind - # package name and remove the trailing - # numbers. - mangledPackage="$(echo "$package" | sed -E 's/[0-9]+$//1')" - # Get the matching rows, this is likely - # to be too many (i.e. more than one). - rows="$(getIdxRows $IDX_PKG "$mangledPackage-[^-]+")" - fi - - # If there is more than one matching row, - # try to match against the origin. - if [ "$(($(echo "$rows" | wc -l)))" -gt "1" ]; then - # Match against the origin. - rows="$(getIdxRows $IDX_ORIGIN "[^|]*/$package" "$rows")" - - # If there is still more than one - # match, match against the origins - # of existing packages. - if [ "$(($(echo "$rows" | wc -l)))" -gt "1" ]; then - for origin in $(getIdxColumn $IDX_ORIGIN "$rows"); { - test -n "$(pkg_info -qO "$origin")" \ - && matchingRows="$matchingRows${matchingRows:+$IFS}$(getIdxRowsEscaped $IDX_ORIGIN "$origin" "$rows")" - } - rows="$matchingRows" - fi - - # Either a single origin is matched or - # it's time to bail out and give up. - if [ "$(($(echo "$rows" | wc -l)))" -ne "1" ]; then - # The wrong amount of matches - # has occured. Bail out. - error $ERR_ARG "Package identifier <$package> not unambiguously matched!" 1>&2 - fi - fi - - # Output if a package has been matched. - if [ -n "$rows" ]; then - # Get the origin of the given package. - origin="$(getIdxColumn $IDX_ORIGIN "$rows")" - # Geth the package name. - package="$(getIdxColumn $IDX_PKG "$rows")" - # Output origin/package pair. - echo "${origin#$idxports/};$package" - else - error $ERR_ARG "Package identifier <$package> not in index!" 1>&2 - fi - fi - ;; - esac -} - -# -# Prints the parameter list and terminates the program. -# -printHelp() { - printf "$name v$version -usage: - $name -h - $name -a [-b] [-bcCdfFlnpvX] [-o new existing] [update] [install] - $name [-bcCdfFlnpvX] [-r [-r]] [-R [-R]] [-o new existing] - %${#name}s [update] [install]\n" '' - exit 0 -} - -# -# Parse the command line parameters. -# -# @param upgrade -# A list of packages to upgrade. -# @param depth -# This is used by the function to store the recursion depth and -# should be unset when calling it. -# @param origin -# This is used by the function across differtent recursion depths to -# remember whether a package origin is expected. -# @param pAll -# Is set if all packages should be update. -# @param pNoBackup -# Is set if backups could not be fetched. -# @param pClean -# Is set to turn off status messages. -# @param pReplaceConflicts -# Is set to replace conflicting packages with new ones instead of -# leaving them alone. -# @param pExitOnConflict -# Is set to stop the program if a conflict is encountered. -# @param pForce -# Is set to force the update of packages that are not really updated. -# @param pFetchOnly -# Is set to only fetch packages instead of installing/upgrading them. -# @param pInteractive -# TODO: Reserved for future versions (resume/roll-back). -# @param pJobs -# TODO: Reserved for future versions (pkg_libchk tests). -# @param pListDiscarded -# Is set to activate the listing of packages that are ignored because -# they are not set in the INDEX. -# @param pNoActions -# Is set if no actions should be performed but a list of what would have -# been done should get printed. -# @param pNoLogging -# Turn off logging. -# @param pParanoid -# Is set to activate cyclic dependency checks. -# @param pRecursive -# Is set to activate updating of dependencies. -# @param pMoreRecursive -# Is set to activate updating of dependencies of depending packages. -# @param pUpwardRecursive -# Is set to activate updating of depending packages. -# @param pMoreUpwardRecursive -# Is set to activate updating of packages depending on dependencies. -# @param pVerbose -# Is set to activate informative output. -# -readParams() { - local arg package escapedPkg depth - # Store the recursion depth. Note that counting down is dealt with - # by making depth local. - depth=$((${depth:--1} + 1)) - - # This is used to remember whether the next parameter should - # be a replacing package or a packge to be replaced. - origin=${origin:-0} - - for arg { - # - # Handle package replacements. - # - if [ $origin -eq 1 ]; then - # Store the replacement. - package="$(identifyPackage "$arg")" || exit $? - if [ -z "$package" -o "$(($(echo "$package" | wc -l)))" -ne "1" ]; then - error $ERR_ARG "The package identifier <$arg> is not unambiguous." - fi - upgrade="$upgrade${upgrade:+$IFS}$package" - replace="$replace${replace:+$IFS}$package" - origin=2 - # Request the download. - downloadManagerMsgRequest "$package" - continue - fi - if [ $origin -eq 2 ]; then - # Store what to replace. - # This is taken from the package database not the index. - - case "$arg" in - */*) - # Assume arg is an origin. - package="$(pkg_info -qO "$arg")" - package="$(pkg_info -qo "$package" 2> /dev/null);$package" - ;; - *) - # Assume arg is a package identifier. - package="$(pkg_info -qo "$arg" 2> /dev/null);$(pkg_info -E "$arg" 2> /dev/null)" - - # Maybe arg is a package identifier - # without a version tail. - if [ "$package" = ";" ]; then - package="$(pkg_info -qo "$arg-*" 2> /dev/null);$(pkg_info -E "$arg-*" 2> /dev/null)" - fi - ;; - esac - - # Arg is not installed. - if [ "$package" = ";" ]; then - error $ERR_ARG "The package <$arg> is not installed and thus cannot be replaced." - fi - # It appears arg is an identifier that is - # not unambiguous. - if [ "$(($(echo "$package" | wc -l)))" -ne "1" ]; then - error $ERR_ARG "The package identifier <$arg> is not unambiguous." - fi - # A package can only be replaced once. - escapedPkg="$(echo "$package" | getIdxEscape)" - if echo "$replace" | grep -qEx ".*\|$escapedPkg"; then - error $ERR_ARG "The package <$arg> is already listed for replacement." - fi - replace="$replace|$package" - origin=0 - continue - fi - - # - # Identify arguments. - # - case "$arg" in - "-a" | "--all") - pAll=1 - if [ -n "$pRecursive" ]; then - error $ERR_ARG "Recursiveness has no effect, because all packages are already selected for processing." - fi - if [ -n "$pUpwardRecursive" ]; then - error $ERR_ARG "Upward recursiveness has no effect, because all packages are already selected for processing." - fi - ;; - "-b" | "--no-backup") - pNoBackup=1 - ;; - "-c" | "--clean") - pClean=-c - ;; - "-C" | "--replace-conflicts") - if [ -n "$pExitOnConflict" ]; then - error $ERR_ARG "The 'replace conflicts' and 'exit on conflict' modes are mutually exclusive." - fi - pReplaceConflicts=1 - ;; - "-d" | "--list-discarded") - pListDiscarded=1 - ;; - "-f" | "--force") - pForce=1 - ;; - "-F" | "--fetch-only") - if [ -n "$pNoActions" ]; then - error $ERR_ARG "The 'no actions' and 'fetch only' modes are mutually exclusive." - fi - pFetchOnly=1 - ;; - "-h" | "--help") - printHelp - ;; - "-i" | "--interactive") - # TODO: not yet used - pInteractive=1 - ;; - -j* | --jobs*) - # TODO: not yet used - pJobs="$arg" - if ! pkg_libchk "$pJobs" DUMMY/DUMMY 1>&2; then - exit $ERR_ARG - fi - ;; - "-l" | "--no-logging") - pNoLogging=1 - ;; - "-n" | "--no-actions") - if [ -n "$pFetchOnly" ]; then - error $ERR_ARG "The 'no actions' and 'fetch only' modes are mutually exclusive." - fi - pNoActions=1 - ;; - "-o" | "--origin") - # Make sure the local index copy is up to date. - getIndex - origin=1 - ;; - "-p" | "--paranoid") - pParanoid=1 - ;; - "-r" | "--recursive") - if [ -n "$pMoreRecursive" ]; then - error $ERR_ARG "There are only two levels of recursiveness." - elif [ -n "$pRecursive" ]; then - pMoreRecursive=1 - else - pRecursive=1 - fi - if [ -n "$pAll" ]; then - error $ERR_ARG "Recursiveness has no effect, because all packages are already selected for processing." - fi - ;; - "-R" | "--upward-recursive") - if [ -n "$pMoreUpwardRecursive" ]; then - error $ERR_ARG "There are only two levels of upward recursiveness." - elif [ -n "$pUpwardRecursive" ]; then - pMoreUpwardRecursive=1 - else - pUpwardRecursive=1 - fi - if [ -n "$pAll" ]; then - error $ERR_ARG "Upward recursiveness has no effect, because all packages are already selected for processing." - fi - ;; - "-v" | "--verbose") - pVerbose=-v - ;; - "-X" | "--exit-on-conflict") - if [ -n "$pReplaceConflicts" ]; then - error $ERR_ARG "The 'exit on conflict' and 'replace conflicts' modes are mutually exclusive." - fi - pExitOnConflict=1 - ;; - -? | --*) - error $ERR_ARG "Unknown parameter \"$arg\"." - ;; - -*) - # Split parmeters. - readParams "${arg%%${arg#-?}}" "-${arg#-?}" - ;; - *) - # Make sure the local index copy is up to date. - getIndex - # Add package to the list of packages to - # upgrade/install. - package="$(identifyPackage "$arg")" || exit $? - upgrade="$upgrade${upgrade:+$IFS}$package" - # Request the download. - downloadManagerMsgRequest "$package" - ;; - esac - } - - # - # Only perform the following steps if this is the root call - # to this function (recursion depth = 0). - # - if [ $depth -eq 0 ]; then - # - # Deal with missing parameters. - # - if [ $origin -eq 1 ]; then - error $ERR_ARG "Incomplete parameters, missing origin." - fi - if [ $origin -eq 2 ]; then - error $ERR_ARG "Incomplete parameters, missing package to replace." - fi - - # - # Deal with invalid levels of recursiveness. - # - if [ -n "$pMoreRecursive" -a -z "$pUpwardRecursive" ]; then - error $ERR_ARG "Thorough recursiveness can only be used in conjunction with upwards recursiveness." - fi - - # - # Remove duplicates in the list of packages to upgrade. - # - upgrade="$(echo "$upgrade" | sort -u)" - # Reset global variables. - origin= - fi -} - -# -# Reads all the required +CONTENTS information from a package. -# The information is stored in variables. -# -# @param 1 -# The name of the package file. -# @param pkgname -# The name of the package. -# @param origin -# The origin of the package. -# @param depends -# The dependencies of the package in the format "<origin>;<package>", -# in reverse order. -# @param conflicts -# A list of regular expressions that can be used to identify conflicting -# packages. -# -readContents() { - local contents line format - contents="$(tar -xOf "$1" '+CONTENTS')" - format= - - pkgname= - origin= - depends= - conflicts= - for line in $contents; { - case "$line" in - @name\ *) - pkgname="${line#@name }" - ;; - @pkgdep\ *) - depends=";${line#@pkgdep }${depends:+$IFS}$depends" - ;; - @comment\ *) - line="${line#@comment }" - case "$line" in - DEPORIGIN:*) - depends="${line#*:}$depends" - ;; - PKG_FORMAT_REVISION:*) - format="${line#*:}" - ;; - ORIGIN:*) - origin="${line#*:}" - ;; - esac - ;; - @conflicts\ *) - conflicts="${conflicts:+$conflicts$IFS}${line#@conflicts }" - ;; - esac - } - - if [ "$format" != "1.1" ]; then - error $ERR_PACKAGE_FORMAT "Unknown package format in <$1>, bailing out!" - fi - - return 0 -} - -# -# Starts a download manager that can be instructed through a queue. -# A process that wants to know what's going on with the download manager -# can simply read from the queue as well. -# -# The download manager keeps as many downloads running as there are -# PACKAGESITE_MIRRORS. Should a download fail, it is retried as soon -# as no untried downloads remain. Every download is only retried once. -# A download is never attempted from the master server. -# -# @param queueMessages -# The queue to create and read from. -# @param packagerepos -# The location of the remote package repository (derived from -# PACKAGESITE). If this is identical with the local repository, -# the download manager will not be started. -# @param pNoActions -# If set, the download manager will not be started. -# -downloadManager() { - # No actions mode, this includes no downloads. - test -n "$pNoActions" && return 0 - - # Packages are locally available, no downloads. - test "$PACKAGES" = "$packagerepos" && return 0 - - verbose "Start the download manager." - - # Initialize the queue. - rm "$queueMessages" 2> /dev/null - touch "$queueMessages" - - # - # The following block is forked away. - # Note that all variable assignments happen in a separate process - # and hence have no effect on the outside. - # - ( - # Remove the queue when exiting and get rid of pending jobs. - trap " - kill \$(jobs -ls) > /dev/null 2>&1 - rm '$queueMessages' 2> /dev/null - exit - " EXIT sigint sigterm - - # The jobs yet to be done. - jobs= - # The available mirrors. - mirrors="$PACKAGESITE_MIRRORS" - # The jobs that should be retried. - retry= - # The jobs that have been retried. - retried= - # The last line read from the socket. - line= - - # Keep on running as long as the father process is around. - # Note that this while loop has the message queue as stdin. - while kill -0 "$pid" 2> /dev/null; do - # Check for a message in the queue. - # There is nothing to be done, if there was no message, - # none the less it times out to allow the terminal - # to catch signals. - read -t 2 line - # Process messages. - case "$line" in - finished:*) - # A download has been finished. - # Add the mirror that was used to - # the list of available mirrors. - mirror="${line#finished:}" - mirror="${mirror%;*}" - mirrors="${mirrors:+$mirrors$IFS}$mirror" - ;; - retry:*) - # A download was not finished - # successfuly. - mirror="${line#retry:}" - job="${mirror##*;}" - mirror="${mirror%;*}" - if echo "$retried" | grep -qFx "$job"; then - # If this package has already - # had a retry, mark it as - # finished to hand it over - # to the package validation - # that can fetch from the - # master server. - downloadManagerMsgFinished "$mirror" "$job" - else - # The first retry request. - # Free the mirror and list - # the package for retry. - mirrors="${mirrors:+$mirrors$IFS}$mirror" - retry="${retry:+$retry$IFS}$job" - fi - ;; - request:*) - # Append requested downloads to the - # list of available jobs. - jobs="${jobs:+$jobs$IFS}${line#request:}" - ;; - exit) - # The download manager has been told - # to terminate. - break - ;; - esac - # Delete the line, so it cannot be read again in the - # next iteration, if reading from the queue has - # timed out. - line= - - # If any mirrors are available and there are jobs - # in the queue, now is the time to dispatch them. - while [ -n "$jobs" -a -n "$mirrors" ]; do - mirror="${mirrors%%$IFS*}" - mirrors="${mirrors#$mirror}" - mirrors="${mirrors#$IFS}" - job="${jobs%%$IFS*}" - jobs="${jobs#$job}" - jobs="${jobs#$IFS}" - downloadManagerFetch "$mirror" "$job" & - done - - # If we have run out of jobs, give the retry stuff. - # a try. - while [ -n "$retry" -a -n "$mirrors" ]; do - mirror="${mirrors%%$IFS*}" - mirrors="${mirrors#$mirror}" - mirrors="${mirrors#$IFS}" - job="${retry%%$IFS*}" - retry="${retry#$job}" - retry="${retry#$IFS}" - # Remember that this job has been retried. - retried="${retried:+$retried$IFS}$job" - downloadManagerFetch "$mirror" "$job" & - done - done < "$queueMessages" - ) & -} - -# -# This is forked off by the download manager to download a package from -# a mirror. -# If the package is already present a download is not attempted. -# -# @param 1 -# The mirror to download from. -# @param 2 -# The name of the package to download. -# -downloadManagerFetch() { - # Get rid of pending jobs. - trap " - kill \$(jobs -ls) > /dev/null 2>&1 - exit - " EXIT sigint sigterm - - # Only do something if the package is not present. - if ! [ -e "$PACKAGES/All/$2.tbz" ]; then - # Create the download location. - mkdir -p "$PACKAGES/All" 2> /dev/null - - # Attempt download from mirror. - # This is forked off, to allow the shell to catch signals. - fetch -qmo "$PACKAGES/All/$2.tbz" "${1%/*?}/All/$2.tbz" > /dev/null 2>&1 & - if ! wait $!; then - # Release the mirror and mark the package for a retry. - downloadManagerMsgRetry "$1" "$2" - return 0 - fi - fi - - # Release the mirror and mark package finished. - downloadManagerMsgFinished "$1" "$2" -} - -# -# Tells the download manager, that a download was unsuccessful. -# -# @param 1 -# The mirror that was used. -# @param 2 -# The name of the package that was not downloaded. -# @param queueMessages -# The message queue to the download manager. -# -downloadManagerMsgRetry() { - # Do not send anything without a queue. - test ! -e "$queueMessages" && return 0 - - lockf -k "$queueMessages" sh -c "echo 'retry:$1;$2' >> '$queueMessages'" -} - -# -# Tells the download manager, that a download has been finished. -# -# @param 1 -# The mirror that was used. -# @param 2 -# The name of the downloaded package. -# @param queueMessages -# The message queue to the download manager. -# -downloadManagerMsgFinished() { - # Do not send anything without a queue. - test ! -e "$queueMessages" && return 0 - - lockf -k "$queueMessages" sh -c "echo 'finished:$1;$2' >> '$queueMessages'" -} - -# -# Requests the download of packages from the download manager. -# -# @param 1 -# A list of packages for download. -# @param queueMessages -# The message queue to the download manager. -# -downloadManagerMsgRequest() { - # Do not send anything without a queue. - test ! -e "$queueMessages" && return 0 - - local request - for request in $1; { - lockf -k "$queueMessages" sh -c "echo 'request:${request#*;}' >> '$queueMessages'" - } -} - -# -# Instructs the download manager to terminate. -# -# @param queueMessages -# The message queue to the download manager. -# -downloadManagerMsgExit() { - # Do not send anything without a queue. - test ! -e "$queueMessages" && return 0 - - lockf -k "$queueMessages" sh -c "echo 'exit' >> '$queueMessages'" -} - -# -# Validates a single package. Validation means it checks whether a package -# is a complete tar archive. Damaged or missing packages will be (re)downloaded -# from the master server (the one named by PACKAGESITE). -# If the package is a valid tar archive the +CONTENTS file will be checked, -# as well. -# -# @param 1 -# The name of the package to validate. -# @param packagerepos -# The location of the remote package collection. This is derived from -# PACKAGESITE. -# @param pending -# The list of pending packages. -# @return -# Return 0 on success. -# -validatePackage() { - local package - package="$1.tbz" - - # Check whether the package is intact and present. - if ! tar -tf "$PACKAGES/All/$package" > /dev/null 2>&1; then - # If the package repository and the local package collection - # are identical, there's no chance to get the package if it's - # not already there. - if [ "$PACKAGES" = "$packagerepos" ]; then - error $ERR_FETCH "The package <$package> is not present." - fi - - # Clean up whatever crap is there. - rm "$PACKAGES/All/$package" 2> /dev/null - - # Try to get the package from the master server. - fetch -mo "$PACKAGES/All/$package" "$packagerepos/All/$package" - - # Check whether the package is present. - if ! [ -e "$PACKAGES/All/$package" ]; then - error $ERR_FETCH "The package <$package> could not be fetched." - fi - - # Check whether the package is a valid tar archive. - if ! tar -tf "$PACKAGES/All/$package" > /dev/null 2>&1; then - error $ERR_FETCH "The package <$package> could not be read." - fi - fi - - # Check whether we can read the package +CONTENTS format. - readContents "$PACKAGES/All/$package" - - # Remove this package from the list of pending packages. - pending="$(echo "$pending" | grep -vFx "$1")" - - # The package is present and intact. - return 0 -} - -# -# Let's get it on! The declarative part is finally over. -# - -# Ignore some signals that should not occur. -trap 'warn "Discard signal SIGHUP."' sighup -trap 'warn "Discard signal SIGUSR1."' sigusr1 -trap 'warn "Discard signal SIGUSR2."' sigusr2 - -# -# Parse command line parameters. -# -readParams "$@" - -# Make sure the index is available for the following operations. -getIndex - -# -# Populate the list of packages out of sync with the index. -# -pkgAll - -# -# Perform dependency checking. -# -pkgDependencies - -# -# Sort packages by their dependencies. -# -pkgSort - -# -# Display tasks. -# -pkgList - -# -# Download packages. -# -pkgDownload - -# -# Upgrade packages. -# -pkgUpgrade - -exit 0 diff --git a/ports-mgmt/bsdadminscripts/files/uma.in b/ports-mgmt/bsdadminscripts/files/uma.in deleted file mode 100644 index 6bba2b122d8b..000000000000 --- a/ports-mgmt/bsdadminscripts/files/uma.in +++ /dev/null @@ -1,436 +0,0 @@ -#!/bin/sh -f -# -# Copyright (c) 2009 -# Dominic Fandrey <kamikaze@bsdforen.de> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -readonly version=1.1.1 -readonly name=uma - -# Return value. -errno=0 -# Allow things to fail properly by ignoring SIGINT in the main process. -trap '' int - -# Used to activate verbose output. -verbose= -# Will be set if files are locally available. -local= - -vardir="%%VAR%%" -lock="$vardir/run/$name.lock" -lockpid="$vardir/run/$name.pid" -identpid="$vardir/run/$name.ident.pid" -conf="%%PREFIX%%/etc/$name.conf" - -# Use line breaks as a delimiter. -IFS=' -' -# Timezone UTC for age comparisons. -export TZ=UTC - -# The bit position of errors. -readonly ERR_LOCK=0 -readonly ERR_ARG=1 -readonly ERR_FETCH_PORTS=2 -readonly ERR_FETCH_VULNDB=3 -readonly ERR_FETCH_INDEX=4 -readonly ERR_EXTRACT_PORTS=5 -readonly ERR_UPDATE_PORTS=6 - -# -# Get environment variables. -# - -# Load the configuration file if present. -if [ -e "$conf" ]; then - . "$conf" -fi - -# Local index location. -: ${PKG_INDEX="$vardir/db/uma/FTPINDEX"} -: ${FTP_TIMEOUT=60} - -# Logic from src/usr.sbin/pkg_install/add/main.c, plus the possibility to -# override the architecture with ARCH. -: ${PACKAGEROOT="ftp://ftp.freebsd.org"} -: ${ARCH="$(uname -m)"} -branch="$(uname -r | tr '[:upper:]' '[:lower:]')" -number="${branch%%.*}" -branch="${branch##*-}" -case "$branch" in - release) - branch=$number-$branch - ;; - stable|current) - branch=${number%%.*}-$branch - ;; - *) - # Fallback to stable for prerelease and the like. - branch=${number%%.*}-stable - ;; -esac -: ${BRANCH=$branch} -: ${PACKAGESITE="$PACKAGEROOT/pub/FreeBSD/ports/$ARCH/packages-$BRANCH/Latest"} -packagetree="${PACKAGESITE%/*?}" -ftp="${PACKAGESITE#*://}" -ftp="${ftp%%/*}" - -# -# Generate PACKAGESITE_MIRRORS if only PACKAGEROOT_MIRRORS are given. -# Note that PACKAGEROOT_MIRRORS and PACKAGESITE_MIRRORS are supposed to be -# a ";" or line feed separated list. Semicolons will be converted to line -# feeds in any case. -# - -# Set PACKAGEROOT_MIRRORS if not set. -if [ -z "$PACKAGEROOT_MIRRORS" ]; then - PACKAGEROOT_MIRRORS= - for i in $(jot 14); { - PACKAGEROOT_MIRRORS="${PACKAGEROOT_MIRRORS:+$PACKAGEROOT_MIRRORS$IFS}ftp://ftp$i.FreeBSD.org" - } -fi - -# Convert semicolon in PACKAGEROOT_MIRRORS. -PACKAGEROOT_MIRRORS="$(echo "$PACKAGEROOT_MIRRORS" | sed "s/;/\\$IFS/g")" -# Build PACKAGESITE_MIRRORS. -if [ -z "${PACKAGESITE_MIRRORS}" ]; then - PACKAGESITE_MIRRORS= - for MIRROR in $PACKAGEROOT_MIRRORS; { - PACKAGESITE_MIRRORS="${PACKAGESITE_MIRRORS:+$PACKAGESITE_MIRRORS$IFS}$MIRROR/pub/FreeBSD/ports/$ARCH/packages-$BRANCH/Latest" - } -fi -# Convert semicolon in PACKAGESITE_MIRRORS. -PACKAGESITE_MIRRORS="$(echo "$PACKAGESITE_MIRRORS" | sed "s/;/\\$IFS/g")" - -# Remove duplicates. -PACKAGEROOT_MIRRORS="$(echo "$PACKAGEROOT_MIRRORS" | sort -u)" -PACKAGESITE_MIRRORS="$(echo "$PACKAGESITE_MIRRORS" | sort -u)" - -# Determine portsdir -portsdir=$(make -V PORTSDIR -f /usr/share/mk/bsd.port.mk 2> /dev/null) -portsdir="${portsdir:-%%PORTS%%}" - -export ARCH BRANCH PKG_INDEX FTP_TIMEOUT PACKAGEROOT PACKAGESITE -export PACKAGEROOT_MIRRORS PACKAGESITE_MIRRORS - -# -# This function is called by a trap when the script exits in verbose mode. -# It reads errno to construct error messages. -# -# @param errno -# The exit status of the script. -# -verbose() { - if [ $(($errno >> $ERR_LOCK & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_LOCK))): Lock owned by someone else." - fi - if [ $(($errno >> $ERR_ARG & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_ARG))): An unknown parameter was supplied." - fi - if [ $(($errno >> $ERR_FETCH_PORTS & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_FETCH_PORTS))): Fetching the ports tree failed." - fi - if [ $(($errno >> $ERR_FETCH_VULNDB & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_FETCH_VULNDB))): Fetching security database failed." - fi - if [ $(($errno >> $ERR_FETCH_INDEX & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_FETCH_INDEX))): Fetching remote INDEX failed." - fi - if [ $(($errno >> $ERR_EXTRACT_PORTS & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_EXTRACT_PORTS))): Extracting the ports tree failed." - fi - if [ $(($errno >> $ERR_UPDATE_PORTS & 1)) -eq 1 ]; then - echo "ERROR($((1 << $ERR_UPDATE_PORTS))): Updating the ports tree failed." - fi -} - -# -# This function spawns a process that takes over a lock. -# -# @param pid -# The PID of the process that requested the lock. -# @param lock -# The location of the lock file. -# @param lockpid -# The location of the PID file for the lock holding process. -# -secureLock() { - lockf "$lock" sh -c " - trap 'exit 0' term - echo '$pid' > '$lock' - echo \"\$\$\" > '$lockpid' - trap 'rm \"$lockpid\"; exit 0' EXIT - while kill -0 '$pid' 2> /dev/null; do - sleep 2 - done - " 2> /dev/null & -} - -# -# Checks whether the currently requesting process holds the lock. -# -# @param pid -# The PID of the process that requested the lock. -# @param lock -# The location of the lock file. -# @return -# Returns 0 if the lock is held for the requesting process or 1 -# if the lock is missing or owned by another process. -# -hasLock() { - test "$pid" -eq "$(cat "$lock" 2> /dev/null)" 2> /dev/null - return $? -} - -# -# Creates a lock for the requesting process. -# -# @param pid -# The PID of the process that requested the lock. -# @param lock -# The location of the lock file. -# @param lockpid -# The location of the PID file for the lock holding process. -# @param portsdir -# The location of the FreeBSD ports tree. -# @return -# Returns 0 on success, 1 on failure. -# -lock() { - local location - - # The requestor already holds the lock. - hasLock && return 0 - - # The process requesting the lock does not exist. - kill -0 "$pid" 2> /dev/null || return 1 $(errno=1) - - # Follow symlinks - location="$(pwd)" - if cd "$portsdir" && portsdir="$(pwd -P)"; then - # Portsdir exists, so we can test for make activity. This - # does not cover all cases, but it covers a lot. - if fstat "$portsdir" | awk '{print $2}' | grep -q make; then - errno=1 - return 1 - fi - fi - cd "$location" - - # Try acquiring the lock. - lockf -st 0 "$lock" "$0" secure $pid 2> /dev/null || return 1 $(errno=1) - # Wait until the locking process is properly set up. - while ! [ -e "$lockpid" -a -e "$lock" ]; do - sleep 0.1 - done - return 0 -} - -# -# Frees a lock unless it is held for another process than the requestor. -# -# @param lock -# The location of the lock file. -# @param lockpid -# The location of the PID file for the lock holding process. -# @return -# Returns 0 on success, 1 on failure. -# -unlock() { - if hasLock; then - # Free the lock. - kill -TERM "$(cat "$lockpid")" - # Wait for the locking process to clean up. - while [ -e "$lockpid" -o -e "$lock" ]; do - sleep 0.1 - done - return 0 - else - errno=1 - return 1 - fi -} - -# -# Prints the command and available parameters. -# -# @param name -# The name of the script. -# @param version -# The version of the script. -# -printHelp() { - echo "$name v$version -usage: - $name [-hv] [pid] [fetch] [extract] [update] [...] - $name [-hv] [pid] fetch [ports] [audit] [ftpindex] - $name [-hv] [pid] extract [ports] - $name [-hv] [pid] update [ports] - $name [-hv] lock [pid] - $name [-hv] unlock [pid]" -} - -# -# Reads the parameters and creates variables that indicates the presence -# of these parameters. -# -# The last numeric value is treated as the requestor PID. It also deals -# -# @param @ -# All parameters to process. -# @param verbose -# Set to 1 if verbose mode is activated. -# @param cmd_* -# Set by this function to indicate the presence of a parameter. -# -readParams() { - local flag - for flag; { - # A numerical parameter is the PID. - if [ "$flag" -eq "$flag" ] 2> /dev/null; then - pid="${flag}" - continue - fi - - # Activate verbose mode for -v. - case "$flag" in - -v | --verbose) - trap 'verbose 1>&2' EXIT - verbose=1 - continue - ;; - -h | --help) - printHelp - continue - ;; - -? | --*) - errno=$((1 << $ERR_ARG)) - exit $errno - ;; - -*) - # Split parameters. - readParams "${flag%${flag#-?}}" "-${flag#-?}" - continue - ;; - esac - - # If the variable is not predefined, the command is unknown. - if eval "test -n \"\${cmd_$flag=1}\""; then - errno=$((1 << $ERR_ARG)) - exit $errno - fi - setvar "cmd_$flag" 1 - } -} - -pid="$$" -cmd_lock= -cmd_unlock= -cmd_secure= -cmd_env= -cmd_fetch= -cmd_extract= -cmd_update= -cmd_ports= -cmd_audit= -cmd_ftpindex= -readParams "$@" - -# -# Exclusive commands that will cause all others to be ignored, in order -# of priority. -# - -if [ -n "$cmd_unlock" ]; then - unlock - return $? -fi - -if [ -n "$cmd_secure" ]; then - secureLock - return $? -fi - -if [ -n "$cmd_lock" ]; then - lock - return $? -fi - -# -# Non-exclusive commands that do not require a lock. -# - -if [ -n "$cmd_env" ]; then - echo "ARCH='$ARCH'" - echo "BRANCH='$BRANCH'" - echo "FTP_TIMEOUT='$FTP_TIMEOUT'" - echo "PACKAGEROOT='$PACKAGEROOT'" - echo "PACKAGESITE='$PACKAGESITE'" - echo "PKG_INDEX='$PKG_INDEX'" - echo "PACKAGEROOT_MIRRORS='$PACKAGEROOT_MIRRORS'" - echo "PACKAGESITE_MIRRORS='$PACKAGESITE_MIRRORS'" -fi - -# Create a local lock if need be. -localLock= -if ! hasLock; then - localLock=1 - lock || return $? -fi - -# Ports tree commands. -if [ -n "$cmd_ports" ]; then - if [ -n "$cmd_fetch" ]; then - portsnap fetch || errno="$((1 << $ERR_FETCH_PORTS | $errno))" - fi - if [ -n "$cmd_extract" ]; then - portsnap extract || errno=$((1 << $ERR_EXTRACT_PORTS | $errno)) - fi - if [ -n "$cmd_update" ]; then - portsnap update || errno=$((1 << $ERR_UPDATE_PORTS | $errno)) - fi -fi - -# Portaudit commands. -if [ -n "$cmd_audit" ]; then - if [ -n "$cmd_fetch" ]; then - portaudit -F || errno=$((1 << $ERR_FETCH_VULNDB | $errno)) - fi -fi - -# Package index commands. -if [ -n "$cmd_ftpindex" ]; then - if ! mkdir -p "${PKG_INDEX%/*}" 2> /dev/null; then - test -n "$verbose" \ - && echo "The directory ${PKG_INDEX%/*} does not exist and cannot be created!" - errno=$((1 << $ERR_FETCH_INDEX | $errno)) - elif [ -n "$cmd_fetch" ]; then - fetch -mo "$PKG_INDEX" "$packagetree/INDEX" \ - || errno=$((1 << $ERR_FETCH_INDEX | $errno)) - fi -fi - - -# Free a local lock. -test -n "$localLock" && unlock - -return $errno - diff --git a/ports-mgmt/bsdadminscripts/pkg-descr b/ports-mgmt/bsdadminscripts/pkg-descr deleted file mode 100644 index 92784ff0e091..000000000000 --- a/ports-mgmt/bsdadminscripts/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is a collection of administration scripts. At the moment it -consists of a script to control rc.d scripts at runtime, a -script that runs common make targets on batches of ports, scripts to set -variables for make jobs (like portconf, but with more possibilities). -And scripts to check for broken packages and missing libraries. - -WWW: https://sourceforge.net/projects/bsdadminscripts/ diff --git a/ports-mgmt/bsdadminscripts/pkg-plist b/ports-mgmt/bsdadminscripts/pkg-plist deleted file mode 100644 index 4bf4787dc387..000000000000 --- a/ports-mgmt/bsdadminscripts/pkg-plist +++ /dev/null @@ -1,35 +0,0 @@ -sbin/distviper -sbin/pkg_libchk -sbin/pkg_upgrade -sbin/pkg_validate -sbin/portconfig -sbin/rcstart -sbin/uma -sbin/rcstatus -sbin/rcstop -sbin/rcrestart -sbin/rconestart -sbin/rconestatus -sbin/rconestop -sbin/rconerestart -sbin/portbuild -sbin/portclean -sbin/portfetch -sbin/portpackage -sbin/portconfig-recursive -sbin/portfetch-recursive -man/man1/bsdadminscripts.1.gz -man/man1/buildflags.awk.1.gz -man/man1/buildflags.conf.1.gz -man/man1/buildflags.mk.1.gz -man/man1/distviper.1.gz -man/man1/pkg_libchk.1.gz -man/man1/pkg_upgrade.1.gz -man/man1/pkg_validate.1.gz -man/man1/portconfig.1.gz -man/man1/rcstart.1.gz -man/man1/uma.1.gz -%%ETCDIR%%/buildflags.conf.sample -%%ETCDIR%%/uma.conf.sample -%%DATADIR%%/buildflags.awk -%%DATADIR%%/buildflags.mk diff --git a/www/Makefile b/www/Makefile index ac13904570e2..06952618965f 100644 --- a/www/Makefile +++ b/www/Makefile @@ -431,7 +431,6 @@ SUBDIR += mod_line_edit SUBDIR += mod_log_sql2 SUBDIR += mod_maxminddb - SUBDIR += mod_md-devel SUBDIR += mod_memcache SUBDIR += mod_memcache_block SUBDIR += mod_mono diff --git a/www/mod_md-devel/Makefile b/www/mod_md-devel/Makefile deleted file mode 100644 index 69b6c54a87a5..000000000000 --- a/www/mod_md-devel/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# Created by: Bernard Spil <brnrd@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= mod_md -PORTVERSION= 1.1.17 -DISTVERSIONPREFIX= v -CATEGORIES= www -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -PKGNAMESUFFIX= -devel - -DEPRECATED= Use the module that is shipped with Apache 2.4 -EXPIRATION_DATE=2019-03-24 - -MAINTAINER= brnrd@FreeBSD.org -COMMENT= Early experience LetsEncrypt module for Apache httpd - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN_mips= fails to compile: md_json.c:29: expected [error|warning|ignored] after pragma GCC diagnostic -BROKEN_mips64= fails to compile: md_json.c:29: expected [error|warning|ignored] after pragma GCC diagnostic - -LIB_DEPENDS= libaprutil-1.so:devel/apr1 \ - libcurl.so:ftp/curl \ - libjansson.so:devel/jansson - -USES= apache:2.4+ autoreconf libtool ssl -USE_GITHUB= yes - -INSTALL_TARGET= install-strip - -GH_ACCOUNT= icing -GH_PROJECT= mod_md - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} \ - --with-jansson=${LOCALBASE} \ - --without-boulder - -SUB_FILES= 999_mod_md.conf pkg-message -DOCSDIR= share/doc/mod_md -PORTDOCS= README README.md - -OPTIONS_DEFINE= DOCS - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/share/doc/mod_md/LICENSE - ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d - ${INSTALL_DATA} ${WRKDIR}/999_mod_md.conf \ - ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d/999_mod_md.conf.sample - ${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_md.so.0.0.0 \ - ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_manageddomain.so.0.0.0 - ${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_md.so - (cd ${STAGEDIR}${PREFIX}/${APACHEMODDIR} && \ - ${LN} mod_manageddomain.so.0.0.0 mod_manageddomain.so) - -.include <bsd.port.mk> diff --git a/www/mod_md-devel/distinfo b/www/mod_md-devel/distinfo deleted file mode 100644 index 91c200fb276e..000000000000 --- a/www/mod_md-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1547293516 -SHA256 (icing-mod_md-v1.1.17_GH0.tar.gz) = 275a36a25f7dc3bab08fa30fc80d5fdb3bd66a3f4701c5a97cda912847cc1133 -SIZE (icing-mod_md-v1.1.17_GH0.tar.gz) = 203139 diff --git a/www/mod_md-devel/files/999_mod_md.conf.in b/www/mod_md-devel/files/999_mod_md.conf.in deleted file mode 100644 index 8df16e9f82e3..000000000000 --- a/www/mod_md-devel/files/999_mod_md.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -# To enable, uncomment the LoadModule line and the -# MDCertificateAgreement line to accept the agreement -# Make sure you DON'T load the mod_md module from the -# Apache port - -# Full documentation in the project's wiki -# https://github.com/icing/mod_md/wiki -# and regular directives in Apache httpd documentation -# https://httpd.apache.org/docs/trunk/mod/mod_md.html - -# LoadModule md_module %%APACHEMODDIR%%/mod_manageddomain.so - -<IfModule md_module> -# MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf -ManagedDomain your_domain.de - -# Module uses ServerAdmin email from your Apache configuration -# during registration, make sure it is up-to-date and working - -</IfModule> diff --git a/www/mod_md-devel/files/pkg-message.in b/www/mod_md-devel/files/pkg-message.in deleted file mode 100644 index 9549f60f862a..000000000000 --- a/www/mod_md-devel/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ - -/!\ This is an early experience non-production-ready version /!\ - -As of Apache httpd 2.4.33, the mod_md module is part of the -regular distribution. - -The module can be enabled by editing the module's configuration file -in %%PREFIX%%/%%APACHEETCDIR%%/modules.d/999_mod_md.conf diff --git a/www/mod_md-devel/pkg-descr b/www/mod_md-devel/pkg-descr deleted file mode 100644 index 43427a0b3680..000000000000 --- a/www/mod_md-devel/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -mod_md a module for Apache httpd that adds support for Let's Encrypt -(and other ACME CAs) as an early experience version. - -This port is here to help people review and comment and test before -it is put into the main Apache httpd repository. Issues you can raise -on the project's website. General discussion is probably best at the -apache httpd-dev mailing list. - -WWW: https://github.com/icing/mod_md diff --git a/www/mod_md-devel/pkg-plist b/www/mod_md-devel/pkg-plist deleted file mode 100644 index 58b5eccba820..000000000000 --- a/www/mod_md-devel/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -%%APACHEMODDIR%%/mod_manageddomain.so.0.0.0 -%%APACHEMODDIR%%/mod_manageddomain.so -@sample %%APACHEETCDIR%%/modules.d/999_mod_md.conf.sample -bin/a2md - diff --git a/x11/Makefile b/x11/Makefile index 89a1dda3cd5f..861c29d27d3a 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -353,7 +353,6 @@ SUBDIR += xballoon SUBDIR += xbanish SUBDIR += xbanner - SUBDIR += xbelld SUBDIR += xbiff SUBDIR += xbindkeys SUBDIR += xbitmaps diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile deleted file mode 100644 index e80da81658b2..000000000000 --- a/x11/xbelld/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Created by: Nosov Artem <chip-set@mail.ru> -# $FreeBSD$ - -PORTNAME= xbelld -PORTVERSION= 0.2b2 -PORTREVISION= 4 -CATEGORIES= x11 -MASTER_SITES= http://www.meowfishies.com/code/ -DISTNAME= ${PORTNAME}-0.2beta2 - -MAINTAINER= chip-set@mail.ru -COMMENT= XBellD is a small daemon for replacing the standard X terminal bell - -DEPRECATED= Depends on audio/esound -EXPIRATION_DATE= 2019-03-25 - -LIB_DEPENDS= libaudiofile.so:audio/libaudiofile - -USES= imake tar:tgz -USE_XORG= ice sm x11 xtrap xmu xt -USE_GNOME= esound - -# xbelld calls sqrt which requires -lm on some architectures -MAKE_ARGS= EXTRA_LDOPTIONS="-lX11 -laudiofile -lm" - -PLIST_FILES= bin/xbelld \ - lib/X11/app-defaults/XBellD \ - man/man1/xbelld.1.gz -XFREE86_HTML_MAN=no - -.include <bsd.port.mk> diff --git a/x11/xbelld/distinfo b/x11/xbelld/distinfo deleted file mode 100644 index 396fdefd15f4..000000000000 --- a/x11/xbelld/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xbelld-0.2beta2.tgz) = 56ddb5c86134fe2e67df52f3a959d0e201a76cc8da8bf7f40fc0977567e9606f -SIZE (xbelld-0.2beta2.tgz) = 16031 diff --git a/x11/xbelld/files/patch-xbell.c b/x11/xbelld/files/patch-xbell.c deleted file mode 100644 index 4aeb9121383c..000000000000 --- a/x11/xbelld/files/patch-xbell.c +++ /dev/null @@ -1,12 +0,0 @@ ---- xbell.c.orig 2002-10-27 00:26:48 UTC -+++ xbell.c -@@ -38,8 +38,7 @@ - #include <sysexits.h> - - #ifndef lint --static const char rcsid[] = -- "$Id: xbell.c,v 1.1 2002/10/27 00:26:48 sethk Exp $"; -+__RCSID("$Id: xbell.c,v 1.1 2002/10/27 00:26:48 sethk Exp $"); - #endif /* !lint */ - - int diff --git a/x11/xbelld/files/patch-xbelld.c b/x11/xbelld/files/patch-xbelld.c deleted file mode 100644 index 8538173ebd68..000000000000 --- a/x11/xbelld/files/patch-xbelld.c +++ /dev/null @@ -1,48 +0,0 @@ ---- xbelld.c.orig 2002-10-27 00:28:36 UTC -+++ xbelld.c -@@ -60,8 +60,7 @@ - #include <dirent.h> - - #ifndef lint --static const char rcsid[] = -- "$Id: xbelld.c,v 1.7 2002/10/27 00:28:36 sethk Exp $"; -+__RCSID("$Id: xbelld.c,v 1.7 2002/10/27 00:28:36 sethk Exp $"); - #endif /* !lint */ - - #define XskRFilename "XskRFilename" -@@ -268,7 +267,7 @@ _hash_nfind(struct hash *hp, - u_int i; - - if (!hp->h_size) -- return NULL; -+ return False; - i = hp->h_hash(data) % hp->h_size; - if (!TAILQ_EMPTY(&(hp->h_buckets[i]))) - { -@@ -805,7 +804,7 @@ _play(struct sound_desc *sdp, float per) - } - - static void --_cb_bell(XETC *tc, XETrapDatum *data, XPointer *unused) -+_cb_bell(XETC *tc, XETrapDatum *data, unsigned char *unused) - { - xBellReq *breq = (xBellReq *)&(data->u.req); - struct client_desc cd, *cdp; -@@ -914,7 +913,7 @@ _rescan(void) - close(dfd); - for (nent = 0, dep = (struct dirent *)dbuf; - (char *)dep - dbuf < nb; -- ++nent, (char *)dep+= dep->d_reclen) -+ ++nent, dep+= dep->d_reclen) - ; - _hash_resize(&(_bd.bd_sndhash), nent * 2); - if (_bd.bd_defsnd) -@@ -924,7 +923,7 @@ _rescan(void) - } - for (dep = (struct dirent *)dbuf; - (char *)dep - dbuf < nb; -- (char *)dep+= dep->d_reclen) -+ dep+= dep->d_reclen) - { - char *suf; - static const char *sufs[] = AUDIO_SUFS; diff --git a/x11/xbelld/pkg-descr b/x11/xbelld/pkg-descr deleted file mode 100644 index 83566d761b31..000000000000 --- a/x11/xbelld/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -XBellD is a small daemon for replacing the standard X Window -System terminal bell with a more interesting set of sounds. -This is useful for systems where the terminal bell is handled -by the "PC Speaker," or where different sounds are desired for -different classes of X clients. - -XBellD works by intercepting terminal bell requests on the -server side, and then playing user-specified sounds through a -PCM capable soundcard. The resource class of the client making -a terminal bell request is used to match a corresponding sound -file which should be played when such a request is made. - -WWW: http://www.meowfishies.com/xbelld.rhtml diff --git a/x11/xbelld/pkg-message b/x11/xbelld/pkg-message deleted file mode 100644 index 0a160ec5c174..000000000000 --- a/x11/xbelld/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -+----------------------------------------------------------------- - -You need to have an X server with the "DEC-XTRAP" module loaded. -In example, an XFree86 configuration file might contain the -following "Modules" section: - - Section "Module" - ... - - # DEC-XTRAP extension module. - Load "xtrap" - EndSection - ------------------------------------------------------------------+ |