Commit Graph

43 Commits

Author SHA1 Message Date
peter
cba886cc02 Add a #ifndef around the HAVE_ICONV settings since it is supplied
by the Makefile.
2015-08-10 00:53:45 +00:00
peter
720031fa19 Don't assume iconv is enabled. I didn't realize there was a configuration
control to turn it off and it wasn't being respected.

Pointed out by:	gshapiro
2015-08-10 00:46:24 +00:00
peter
5788a496ce Fix typo introduced in r275079 2015-08-09 05:38:31 +00:00
peter
83a1d47de7 Update svnlite from 1.8.10 to 1.8.14. This is mostly for client-side bug
fixes and quality of life improvements.
While there are security issues in this time frame that affect usage as a
server (eg: linked into apache), this isn't possible here.
2015-08-09 05:22:53 +00:00
peter
a55265d19a Update apr-util config - I don't believe this part is used by svn, but
if it were, use shm_* instead of sysvshm.
2015-08-09 05:15:28 +00:00
peter
a9920216aa Update apr-1.5.1 to 1.5.2 2015-08-09 05:14:25 +00:00
sjg
008d7c831f Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision:       D2796
Reviewed by: brooks imp
2015-06-13 19:20:56 +00:00
sjg
65145fa4c8 Merge sync of head 2015-05-27 01:19:58 +00:00
gjb
4bd760cd4d Reduce number of lines to set ORGANIZATION_NAME in
freebsd-organization.h.

Patched by:	ian
PR:		197540
MFC after:	3 days
X-MFC-with:	r278603
Sponsored by:	The FreeBSD Foundation
2015-02-12 00:17:14 +00:00
gjb
34ff9bcd54 Ensure ORGANIZATION_NAME is quoted when ORGANIZATION
could contain strings of two or more words.

Reviewed by:	peter
Reported by:	karl@denninger.net
PR:		197540
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-02-11 22:59:24 +00:00
bapt
f120eefca8 Convert svn to LIBADD reduce overlinking 2014-11-25 21:43:51 +00:00
bapt
ac30980145 Promote SQLite3 as a privatelib as it will also be used by mandoc
While here ensure sqlite3 is using pread(2) and enable the suppot for FTS4
2014-11-22 19:44:49 +00:00
bapt
59bf78cc76 Add missing dependencies on pthread (sqlite being built with threadsafety on) 2014-11-22 19:17:05 +00:00
sjg
b137080f19 Merge from head@274682 2014-11-19 01:07:58 +00:00
gjb
82a59e9c6d Add svnlite.1 to CLEANFILES.
MFC after:	3 days
X-MFC-To:	stable/10 only
Sponsored by:	The FreeBSD Foundation
2014-08-26 20:40:12 +00:00
bdrewery
b619f0c747 Revert r267233 for now. PIE support needs to be reworked.
1. 50+% of NO_PIE use is fixed by adding -fPIC to INTERNALLIB and other
   build-only utility libraries.
2. Another 40% is fixed by generating _pic.a variants of various libraries.
3. Some of the NO_PIE use is a bit absurd as it is disabling PIE (and ASLR)
   where it never would work anyhow, such as csu or loader. This suggests
   there may be better ways of adding support to the tree. Many of these
   cases can be fixed such that -fPIE will work but there is really no
   reason to have it in those cases.
4. Some of the uses are working around hacks done to some Makefiles that are
   really building libraries but have been using bsd.prog.mk because the code
   is cleaner. Had they been using bsd.lib.mk then NO_PIE would not have
   been needed.

We likely do want to enable PIE by default (opt-out) for non-tree consumers
(such as ports). For in-tree though we probably want to only enable PIE
(opt-in) for common attack targets such as remote service daemons and setuid
utilities. This is also a great performance compromise since ASLR is expected
to reduce performance. As such it does not make sense to enable it in all
utilities such as ls(1) that have little benefit to having it enabled.

Reported by:	kib
2014-08-19 15:04:32 +00:00
sjg
d7cd1d425c Merge head from 7/28 2014-08-19 06:50:54 +00:00
peter
f9b5f7791d Update serf-1.3.6 -> 1.3.7
Update subversion-1.8.9 -> 1.8.10

Security:	CVE-2014-3504, CVE-2014-3522, CVE-2014-3528
2014-08-11 19:41:01 +00:00
eadler
2adf2a899a Add documentation for svnlite.
PR:		191544
Reported by:	eric
Reviewed by:	imp
MFC After: 	1 week
2014-07-02 05:09:41 +00:00
bdrewery
989e2c6000 In preparation for ASLR [1] support add WITH_PIE to support building with -fPIE.
This is currently an opt-in build flag. Once ASLR support is ready and stable
it should changed to opt-out and be enabled by default along with ASLR.

Each application Makefile uses opt-out to ensure that ASLR will be enabled by
default in new directories when the system is compiled with PIE/ASLR. [2]

Mark known build failures as NO_PIE for now.

The only known runtime failure was rtld.

[1] http://www.bsdcan.org/2014/schedule/events/452.en.html
Submitted by:		Shawn Webb <lattera@gmail.com>
Discussed between:	des@ and Shawn Webb [2]
2014-06-08 17:29:31 +00:00
peter
7651afa9c8 Update backend files and makefiles for apr 1.4.8 -> 1.5.1 2014-05-27 07:16:43 +00:00
peter
1d99647092 Merge svn-1.8.8 -> 1.8.9 2014-05-27 04:59:53 +00:00
sjg
ed3fc70bf5 Merge from head 2014-05-08 23:54:15 +00:00
imp
2118f42afd Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
2014-05-06 04:22:01 +00:00
sjg
5e568154a0 Merge head 2014-04-28 07:50:45 +00:00
imp
e27daff3c9 Eliminate last vestigies of NO_MAN= in the tree. Also, remove
ineffectual NOMAN= lines. These don't change the build at all.
2014-04-25 19:25:05 +00:00
imp
c39e6fc2c9 NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
and finish the job. ncurses is now the only Makefile in the tree that
uses it since it wasn't a simple mechanical change, and will be
addressed in a future commit.
2014-04-13 05:21:56 +00:00
peter
6c44c70624 Match our implementation of iconv's inbuf argument. 2014-02-20 20:09:28 +00:00
peter
5d993dc7e6 Import svn-1.8.8.
Highlights:
* Security fix for apache server plugin that we don't build or use
* sqlite performance improvements.
* bug fixes for edge cases and some other less common operations.
2014-02-20 19:48:47 +00:00
peter
1ccf3e1cc7 Import svn-1.8.5. This contains a user-visible fix for svn:externals
handling (there are no svn:externals in freebsd repo), and two security
fixes for modules that we don't build for the apache http server stack.
2013-11-25 17:52:16 +00:00
gjb
7a6ad5e133 Somewhat mimic how the devel/subversion port prepopulates
'Sponsored by:' in the FreeBSD commit template.

Support for this has already existed ^/head/contrib/subversion
but it was not enabled in usr.bin/svn/svn/Makefile.

To use the pre-populated 'Sponsored by:' entry, set ORGANIZATION
in make.conf(5), for example:

    ORGANIZATION=   "The FreeBSD Foundation"

Reviewed by:	peter
Sponsored by:	The FreeBSD Foundation
2013-11-13 05:25:49 +00:00
peter
44efc7cc33 Update svn from 1.8.1 to 1.8.4 - minor security fixes and client side
merge handling bug fixes (reintegrate, mergeinfo etc)
2013-11-11 01:14:58 +00:00
sjg
7fcd33c1fa Merge head@256284 2013-10-13 02:35:19 +00:00
sjg
a5de61803f New dependencies 2013-10-13 00:22:44 +00:00
nwhitehorn
91400d13ad Disable use of compiler atomic builtins. For APR, this is limited to
architectures where they are known not to work. For SVN itself, use
the least common denominator and disable them across the board. This
allows svnlite to build and run on all FreeBSD architectures.

Approved by:	re (gjb)
2013-10-04 18:27:02 +00:00
dim
fcc4821fc1 Make svnlite (actually libapr) work correctly on big-endian arches.
Otherwise, you would get errors similar to:

$ svn co svn://svn.freebsd.org/base/head test
A    test/lib
A    test/lib/libutil
svn: E200014: Checksum mismatch for
'/home/dim/test/lib/libutil/kinfo_getproc.3':
   expected:  0882097a545210d88edff8f63b328602
     actual:  b378eb08a0f4d4c97c513c4b17207f59

Approved by:	re (gjb, marius)
2013-09-19 06:31:03 +00:00
peter
bce4a8587d Update serf 1.2.1 -> 1.3.0 for svn 2013-08-02 19:21:46 +00:00
peter
0aadc82afb Update subversion-1.8.0 -> 1.8.1. Update supporting
components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.

This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.
2013-07-28 06:02:40 +00:00
peter
75dee8bb5a If you've compiled your base system with WITH_ICONV, then use it for svn
alongside the other consumers (bsdtar, csh etc).

The svnlite build gets upset when it hits non-ascii characters in
inconvenient places.
2013-07-01 07:07:35 +00:00
peter
db19956e7f Update to current configuration. 2013-07-01 07:00:12 +00:00
truckman
a7d8c6740e Fix a couple of typos that broke buildworld for me.
Reviewed by:	peter
2013-06-19 19:44:57 +00:00
peter
88439828cc Tweak generated config to make it more likely to work on 32 bit systems.
Pointed out by:	Trond.Endrestol@fagskolen.gjovik.no
2013-06-18 16:05:33 +00:00
peter
6c648dd642 Introduce svnlite so that we can check out our source code again.
This is actually a fully functional build except:
* All internal shared libraries are static linked to make sure there
  is no interference with ports (and to reduce build time).
* It does not have the python/perl/etc plugin or API support.
* By default, it installs as "svnlite" rather than "svn".
* If WITH_SVN added in make.conf, you get "svn".
* If WITHOUT_SVNLITE is in make.conf, this is completely disabled.

To be absolutely clear, this is not intended for any use other than
checking out freebsd source and committing, like we once did with cvs.

It should be usable for small scale local repositories that don't
need the python/perl plugin architecture.
2013-06-18 02:53:45 +00:00