1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2 "http://www.w3.org/TR/html4/loose.dtd">
5 <title>Releasing a New Version</title>
6 <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
7 <link rel="HOME" title="Privoxy Developer Manual" href="index.html">
8 <link rel="PREVIOUS" title="Testing Guidelines" href="testing.html">
9 <link rel="NEXT" title="Update the Webserver" href="webserver-update.html">
10 <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
11 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
13 <body class="SECT1" bgcolor="#EEEEEE" text="#000000" link="#0000FF" vlink="#840084" alink="#0000FF">
14 <div class="NAVHEADER">
15 <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
17 <th colspan="3" align="center">Privoxy Developer Manual</th>
20 <td width="10%" align="left" valign="bottom"><a href="testing.html" accesskey="P">Prev</a></td>
21 <td width="80%" align="center" valign="bottom"></td>
22 <td width="10%" align="right" valign="bottom"><a href="webserver-update.html" accesskey="N">Next</a></td>
25 <hr align="left" width="100%">
28 <h1 class="SECT1"><a name="NEWRELEASE" id="NEWRELEASE">6. Releasing a New Version</a></h1>
29 <p>When we release versions of <span class="APPLICATION">Privoxy</span>, our work leaves our cozy secret lab and
30 has to work in the cold RealWorld[tm]. Once it is released, there is no way to call it back, so it is very
31 important that great care is taken to ensure that everything runs fine, and not to introduce problems in the very
33 <p>So when releasing a new version, please adhere exactly to the procedure outlined in this chapter.</p>
34 <p>The following programs are required to follow this process: <tt class="FILENAME">ssh</tt>, <tt class=
35 "FILENAME">gmake</tt> (GNU's version of make), autoconf, git, a web browser.</p>
37 <h2 class="SECT2"><a name="VERSIONNUMBERS" id="VERSIONNUMBERS">6.1. Version numbers</a></h2>
38 <p>First you need to determine which version number the release will have. <span class=
39 "APPLICATION">Privoxy</span> version numbers consist of three numbers, separated by dots, like in X.Y.Z (e.g.
43 <p>X, the version major, is rarely ever changed. It is increased by one if turning a development branch into
44 stable substantially changes the functionality, user interface or configuration syntax. Majors 1 and 2 were
45 <span class="APPLICATION">Junkbuster</span>, and 3 is the first stable <span class=
46 "APPLICATION">Privoxy</span> release.</p>
49 <p>Y, the version minor, represents the branch within the major version. At any point in time, there are two
50 branches being maintained: The stable branch, with an even minor, say, 2N, in which no functionality is being
51 added and only bug-fixes are made, and 2N+1, the development branch, in which the further development of
52 <span class="APPLICATION">Privoxy</span> takes place. This enables us to turn the code upside down and inside
53 out, while at the same time providing and maintaining a stable version. The minor is reset to zero (and one)
54 when the major is incremented. When a development branch has matured to the point where it can be turned into
55 stable, the old stable branch 2N is given up (i.e. no longer maintained), the former development branch 2N+1
56 becomes the new stable branch 2N+2, and a new development branch 2N+3 is opened.</p>
59 <p>Z, the point or sub version, represents a release of the software within a branch. It is therefore
60 incremented immediately after each software release. The point version is reset to zero when the minor
62 <p>Stable branches work a little differently, since there should be little to no development happening in
63 such branches. Remember, only bugfixes, which presumably should have had some testing before being committed.
64 Stable branches will then have their version reported as <tt class="LITERAL">0.0.0</tt>, during that period
65 between releases when changes are being added. This is to denote that this code is <span class=
66 "emphasis"><i class="EMPHASIS">not for release</i></span>. Then as the release nears, the version is bumped
67 according: e.g. <tt class="LITERAL">3.0.1 -> 0.0.0 -> 3.0.2</tt>.</p>
70 <p>In summary, the main Git trunk is the development branch where new features are being worked on for the next
71 stable series. This should almost always be where the most activity takes place. There is always at least one
72 stable branch from the trunk, e.g now it is <tt class="LITERAL">3.0</tt>, which is only used to release stable
73 versions. Once the initial *.0 release of the stable branch has been done, then as a rule, only bugfixes that
74 have had prior testing should be committed to the stable branch. Once there are enough bugfixes to justify a new
75 release, the version of this branch is again incremented Example: 3.0.0 -> 3.0.1 -> 3.0.2, etc are all
76 stable releases from within the stable branch. 3.1.x is currently the main trunk, and where work on 3.2.x is
77 taking place. If any questions, please post to the devel list <span class="emphasis"><i class=
78 "EMPHASIS">before</i></span> committing to a stable branch!</p>
79 <p>Developers should remember too that if they commit a bugfix to the stable branch, this will more than likely
80 require a separate submission to the main trunk, since these are separate development trees within Git. If you
81 are working on both, then this would require at least two separate check outs (i.e main trunk, <span class=
82 "emphasis"><i class="EMPHASIS">and</i></span> the stable release branch, which is <tt class=
83 "LITERAL">v_3_0_branch</tt> at the moment).</p>
86 <h2 class="SECT2"><a name="BEFORERELEASE" id="BEFORERELEASE">6.2. Before the Release</a></h2>
87 <p>The following <span class="emphasis"><i class="EMPHASIS">must be done by one of the developers</i></span>
88 prior to each new release.</p>
91 <p>Make sure that everybody who has worked on the code in the last couple of days has had a chance to yell
92 <span class="QUOTE">"no!"</span> in case they have pending changes/fixes in their pipelines. Announce the
93 freeze so that nobody will interfere with last minute changes.</p>
96 <p>Update the code status (CODE_STATUS="xxx") in <tt class="FILENAME">configure.in</tt> to one of "alpha",
97 "beta" or "stable".</p>
100 <p>Rebuild configure and GNUMakefile to make sure the updated values are being used.</p>
101 <table border="0" bgcolor="#E0E0E0" width="90%">
104 <pre class="PROGRAMLISTING"> $ autoheader && autoconf # rebuild configure
105 $ ./configure # rebuild GNUmakefile</pre>
111 <p><b class="COMMAND">make dok-release</b> to update the sgml documentation source files.</p>
114 <p>If action file processing has changed and is not backward-compatible, make sure the
115 "for-privoxy-version=x.y.z" minimum version number in <tt class="FILENAME">default.action.master</tt> has
117 <table border="0" bgcolor="#E0E0E0" width="90%">
120 <pre class="PROGRAMLISTING"> {{settings}}
121 #############################################################################
122 #MASTER# COMMENT: The minimum Privoxy version:
123 for-privoxy-version=3.0.11</pre>
129 <p>Create the change log:</p>
130 <table border="0" bgcolor="#E0E0E0" width="90%">
133 <pre class="PROGRAMLISTING"> $ git tag
135 $ git log [last release tag]..master > /tmp/log
136 # get the commit log since the last release
137 $ utils/makeChangeLog /tmp/log > /tmp/change.log
138 # reformat the commit log</pre>
142 <p>Edit <tt class="FILENAME">/tmp/change.log</tt> to remove trivial changes and group the changes under
143 general headings like:</p>
144 <table border="0" bgcolor="#E0E0E0" width="90%">
147 <pre class="PROGRAMLISTING"> - Bug fixes:
148 - Action file improvements:
149 - Filter file improvements:
150 - General improvements:
151 - Documentation improvements:
152 - Build system improvements:
154 - Privoxy-Log-Parser:
155 - Privoxy-Regression-Test:</pre>
159 <p>Add the contents of <tt class="FILENAME">/tmp/change.log</tt> to the start of <tt class=
160 "FILENAME">ChangeLog</tt> and re-create <tt class="FILENAME">doc/source/changelog.sgml</tt>:</p>
161 <table border="0" bgcolor="#E0E0E0" width="90%">
165 "PROGRAMLISTING"> $ utils/changelog2doc.pl /tmp/change.log >| doc/source/changelog.sgml</pre>
171 <p>All developers should look at the <tt class="FILENAME">ChangeLog</tt> and make sure noteworthy changes are
175 <p>Update the announcement at <tt class="FILENAME">doc/webserver/announce.txt</tt>.</p>
178 <p>All documentation should be rebuilt:</p>
179 <table border="0" bgcolor="#E0E0E0" width="90%">
182 <pre class="PROGRAMLISTING"> $ make man
186 $ make config-file</pre>
189 </table>Finished docs should be then be committed to Git (for those without the ability to build these). Some
190 docs may require rather obscure processing tools. <tt class="FILENAME">config</tt>, the man page (and the
191 html version of the man page) fall in this category. README, the man page, AUTHORS, and config should all
192 also be committed to Git for other packagers. The formal docs should be uploaded to the webserver. See the
193 section <a href="webserver-update.html" target="_top">"Updating the webserver"</a> in this manual for
197 <p><span class="emphasis"><i class="EMPHASIS">Commit all files that were changed in the above
198 steps!</i></span></p>
201 <p>The <i class="CITETITLE">User Manual</i> is also used for context sensitive help for the CGI editor. This
202 is version sensitive, so that the user will get appropriate help for his/her release. So with each release a
203 fresh version should be uploaded to the webserver (this is in addition to the main <i class="CITETITLE">User
204 Manual</i> link from the main page since we need to keep manuals for various versions available). The CGI
205 pages will link to something like <tt class="LITERAL">https://www.privoxy.org/$(VERSION)/user-manual/</tt>.
206 This needs to be updated for each new release and is done with the <span class="QUOTE">"webserver"</span>
210 <p>Tag all files in Git with the version number with <span class="QUOTE">"<b class="COMMAND">git tag -s
211 v_X_Y_Z</b>"</span>. Don't use vX_Y_Z, ver_X_Y_Z, v_X.Y.Z (won't work) etc.</p>
214 <p>Push the tag to the remote with <span class="QUOTE">"<b class="COMMAND">git push origin
215 v_X_Y_Z</b>"</span>.</p>
218 <p>On the webserver, copy the user manual to a new top-level directory called <tt class=
219 "FILENAME">X.Y.Z</tt>. This ensures that help links from the CGI pages, which have the version as a prefix,
220 will go into the right version of the manual. If this is a development branch release, also symlink
221 <tt class="FILENAME">X.Y.(Z-1)</tt> to <tt class="FILENAME">X.Y.Z</tt> and <tt class=
222 "FILENAME">X.Y.(Z+1)</tt> to <tt class="FILENAME">.</tt> (i.e. dot).</p>
227 <h2 class="SECT2"><a name="THERELEASE" id="THERELEASE">6.3. Building and Releasing the Packages</a></h2>
228 <p>Now the individual packages can be built and released. Note that for GPL reasons the first package to be
229 released is always the source tarball.</p>
230 <p>For <span class="emphasis"><i class="EMPHASIS">all</i></span> types of packages, including the source tarball,
231 <span class="emphasis"><i class="EMPHASIS">you must make sure that you build from clean sources by exporting the
232 right version from Git into an empty directory</i></span> (just press return when asked for a password):</p>
233 <table border="0" bgcolor="#E0E0E0" width="100%">
236 <pre class="PROGRAMLISTING"> mkdir dist # delete or choose different name if it already exists
238 git clone https://www.privoxy.org/git/privoxy.git
240 git checkout v_X_Y_Z</pre>
244 <p><span class="emphasis"><i class="EMPHASIS">Do NOT change</i></span> a single bit, including, but not limited
245 to version information after export from Git. This is to make sure that all release packages, and with them, all
246 future bug reports, are based on exactly the same code.</p>
247 <div class="WARNING">
248 <table class="WARNING" border="1" width="100%">
250 <td align="center"><b>Warning</b></td>
254 <p>Every significant release of Privoxy has included at least one package that either had incorrect
255 versions of files, missing files, or incidental leftovers from a previous build process that gave unknown
256 numbers of users headaches to try to figure out what was wrong. PLEASE, make sure you are using pristene
257 sources, and are following the prescribed process!</p>
262 <p>Please find additional instructions for the source tarball and the individual platform dependent binary
263 packages below. And details on the Sourceforge release process below that.</p>
265 <h3 class="SECT3"><a name="PACK-GUIDELINES" id="PACK-GUIDELINES">6.3.1. Note on Privoxy Packaging</a></h3>
266 <p>Please keep these general guidelines in mind when putting together your package. These apply to <span class=
267 "emphasis"><i class="EMPHASIS">all</i></span> platforms!</p>
270 <p><span class="APPLICATION">Privoxy</span> <span class="emphasis"><i class="EMPHASIS">requires</i></span>
271 write access to: all <tt class="FILENAME">*.action</tt> files, all logfiles, and the <tt class=
272 "FILENAME">trust</tt> file. You will need to determine the best way to do this for your platform.</p>
275 <p>Please include up to date documentation. At a bare minimum:</p>
279 <td><tt class="FILENAME">LICENSE</tt> (top-level directory)</td>
286 <td><tt class="FILENAME">README</tt> (top-level directory)</td>
293 <td><tt class="FILENAME">AUTHORS</tt> (top-level directory)</td>
300 <td><tt class="FILENAME">man page</tt> (top-level directory, Unix-like platforms only)</td>
307 <td><tt class="FILENAME">The User Manual</tt> (doc/webserver/user-manual/)</td>
314 <td><tt class="FILENAME">FAQ</tt> (doc/webserver/faq/)</td>
318 <p>Also suggested: <tt class="FILENAME">Developer Manual</tt> (doc/webserver/developer-manual) and
319 <tt class="FILENAME">ChangeLog</tt> (top-level directory). <tt class="FILENAME">FAQ</tt> and the manuals
321 <p>The documentation has been designed such that the manuals are linked to each other from parallel
322 directories, and should be packaged that way. <tt class="FILENAME">privoxy-index.html</tt> can also be
323 included and can serve as a focal point for docs and other links of interest (and possibly renamed to
324 <tt class="FILENAME">index.html</tt>). This should be one level up from the manuals. There is a link also
325 on this page to an HTMLized version of the man page. To avoid 404 for this, it is in Git as <tt class=
326 "FILENAME">doc/webserver/man-page/privoxy-man-page.html</tt>, and should be included along with the
327 manuals. There is also a css stylesheets that can be included for better presentation: <tt class=
328 "FILENAME">p_doc.css</tt>. This should be in the same directory with <tt class=
329 "FILENAME">privoxy-index.html</tt>, (i.e. one level up from the manual directories).</p>
332 <p><tt class="FILENAME">user.action</tt> and <tt class="FILENAME">user.filter</tt> are designed for local
333 preferences. Make sure these do not get overwritten! <tt class="FILENAME">config</tt> should not be
334 overwritten either. This has especially important configuration data in it. <tt class="FILENAME">trust</tt>
335 should be left in tact as well.</p>
338 <p>Other configuration files (<tt class="FILENAME">default.action</tt>, <tt class=
339 "FILENAME">regression-tests.action</tt> and <tt class="FILENAME">default.filter</tt>) should be installed
340 as the new defaults, but all previously installed configuration files should be preserved as backups. This
341 is just good manners :-) These files are likely to change between releases and contain important new
342 features and bug fixes.</p>
345 <p>Please check platform specific notes in this doc, if you haven't done <span class=
346 "QUOTE">"Privoxy"</span> packaging before for other platform specific issues. Conversely, please add any
347 notes that you know are important for your platform (or contact one of the doc maintainers to do this if
351 <p>Packagers should do a <span class="QUOTE">"clean"</span> install of their package after building it. So
352 any previous installs should be removed first to ensure the integrity of the newly built package. Then run
353 the package for a while to make sure there are no obvious problems, before uploading.</p>
358 <h3 class="SECT3"><a name="NEWRELEASE-TARBALL" id="NEWRELEASE-TARBALL">6.3.2. Source Tarball</a></h3>
359 <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
360 into an empty directory</i></span>. (See "Building and releasing packages" above). Then run from that
362 <table border="0" bgcolor="#E0E0E0" width="100%">
365 <pre class="PROGRAMLISTING"> autoheader && autoconf && ./configure</pre>
370 <table border="0" bgcolor="#E0E0E0" width="100%">
373 <pre class="PROGRAMLISTING"> make tarball-dist</pre>
379 <h3 class="SECT3"><a name="NEWRELEASE-WINDOWS" id="NEWRELEASE-WINDOWS">6.3.3. Windows</a></h3>
380 <p>Note that the docbook generated files might need some hand editing, so the Windows build makefile does not
381 rebuild the docs.</p>
382 <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
383 into an empty directory</i></span>. (See "Building and releasing packages" above).</p>
384 <p>Check that you have the current versions of the <a href=
385 "https://sourceforge.net/projects/nsis/files/NSIS%203/" target="_top">NSIS installer</a>, <a href=
386 "https://ftp.pcre.org/pub/pcre/" target="_top">PCRE library</a>, <a href="https://tls.mbed.org/download"
387 target="_top">MBED TLS library</a>, <a href="https://github.com/google/brotli/releases" target="_top">Brotli
388 library</a>, and that the <span class="emphasis"><i class="EMPHASIS">MAKENSIS</i></span> evar in <tt class=
389 "FILENAME">windows/GNUMakefile</tt> points to the NSIS installer program. (See the <a href=
390 "../user-manual/installation.html#WINBUILD-CYGWIN" target="_top"><span class="emphasis"><i class=
391 "EMPHASIS">Building from Source / Windows</i></span></a> section of the User Manual for details.)</p>
392 <p>Then you can build the package. This is fully automated, and is controlled by <tt class=
393 "FILENAME">windows/GNUmakefile</tt>. All you need to do is:</p>
394 <table border="0" bgcolor="#E0E0E0" width="100%">
397 <pre class="PROGRAMLISTING"> cd windows
402 <p>Now you can manually rename <tt class="FILENAME">privoxy_setup.exe</tt> to <tt class=
403 "FILENAME">privoxy_setup_X.Y.Z.exe</tt>, and the <tt class="FILENAME">build</tt> directory to <tt class=
404 "FILENAME">privoxy_X.Y.Z</tt>. Create a .zip file of the newly renamed <tt class="FILENAME">privoxy_X.Y.Z</tt>
405 directory, GPG sign the installer and zip file,</p>
406 <table border="0" bgcolor="#E0E0E0" width="100%">
409 <pre class="PROGRAMLISTING"> gpg --armor --detach --sign <tt class=
410 "FILENAME">privoxy_setup_X.Y.Z.exe</tt>
411 gpg --armor --detach --sign <tt class="FILENAME">privoxy_X.Y.Z.zip</tt></pre>
415 <p>and upload the files to SourceForge.</p>
416 <p>When releasing the package on SourceForge, use the release notes and Change Log from the source tarball
420 <h3 class="SECT3"><a name="NEWRELEASE-DEBIAN" id="NEWRELEASE-DEBIAN">6.3.4. Debian</a></h3>
421 <p>Using git-buildpackage we start with a clone of the last Debian version:</p>
422 <table border="0" bgcolor="#E0E0E0" width="100%">
425 <pre class="PROGRAMLISTING"> gbp clone https://salsa.debian.org/debian/privoxy.git
430 <p>or if the repository is already there</p>
431 <table border="0" bgcolor="#E0E0E0" width="100%">
434 <pre class="PROGRAMLISTING"> cd privoxy
439 <p>Now import the newly released upstream tarball via debian/watch file:</p>
440 <table border="0" bgcolor="#E0E0E0" width="100%">
443 <pre class="PROGRAMLISTING"> gbp import-orig --uscan</pre>
447 <p>Next update all Debian quilt patches to the new version:</p>
448 <table border="0" bgcolor="#E0E0E0" width="100%">
451 <pre class="PROGRAMLISTING"> while quilt push; do quilt refresh; done</pre>
455 <p>If some patch is no longer required (because it is already merged upstream), it can be removed using</p>
456 <table border="0" bgcolor="#E0E0E0" width="100%">
459 <pre class="PROGRAMLISTING"> quilt delete XX_patchname.patch
460 git rm debian/patches/XX_patchname.patch</pre>
464 <p>If the patch needs modification, you can apply, edit and update it with</p>
465 <table border="0" bgcolor="#E0E0E0" width="100%">
468 <pre class="PROGRAMLISTING"> quilt push -f
475 <table border="0" bgcolor="#E0E0E0" width="100%">
478 <pre class="PROGRAMLISTING"> while quilt push; do quilt refresh; done</pre>
482 <p>succeeds. Then you can</p>
483 <table border="0" bgcolor="#E0E0E0" width="100%">
486 <pre class="PROGRAMLISTING"> quilt pop -a</pre>
490 <p>Now add a new entry to the debian/changelog representing the new version:</p>
491 <table border="0" bgcolor="#E0E0E0" width="100%">
494 <pre class="PROGRAMLISTING"> dch -v 3.0.34-1</pre>
498 <p>and describe what you did before and don't forget to git commit all changes.</p>
499 <p>Now you can build the package on the local machine using</p>
500 <table border="0" bgcolor="#E0E0E0" width="100%">
503 <pre class="PROGRAMLISTING"> gbp buildpackage -us -uc</pre>
507 <p>You should check for warnings using</p>
508 <table border="0" bgcolor="#E0E0E0" width="100%">
511 <pre class="PROGRAMLISTING"> lintian -iI ../build-area/privoxy_3.0.34-1_amd64.changes</pre>
515 <p>Maybe rebuild the package in different defined cowbuilder environments like</p>
516 <table border="0" bgcolor="#E0E0E0" width="100%">
520 "PROGRAMLISTING"> sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.34-1.dsc</pre>
524 <p>And try to run autopackage testing suite on the result:</p>
525 <table border="0" bgcolor="#E0E0E0" width="100%">
529 "PROGRAMLISTING"> autopkgtest /var/cache/pbuilder/result/privoxy_3.0.34-1_amd64.changes -s -- schroot sid</pre>
533 <p>Or just push the changes to salsa.debian.org, where a CI pipeline is defined for the package, that builds
535 <p>If everything is okay, run cowbuilder with i386 and amd64 environments for current Debian stable release and
536 build privoxy_3.0.34-1_i386.deb and privoxy_3.0.34-1_amd64.deb. Then sign both files:</p>
537 <table border="0" bgcolor="#E0E0E0" width="100%">
540 <pre class="PROGRAMLISTING"> gpg --detach-sign --armor privoxy_3.0.34-1_i386.deb
541 gpg --detach-sign --armor privoxy_3.0.34-1_amd64.deb</pre>
545 <p>Create a README file containing the recent block from debian/changelog and upload the two packages, the two
546 signatures and the README to a freshly created folder below
547 https://sourceforge.net/projects/ijbswa/files/Debian/</p>
549 <h4 class="SECT4"><a name="SNAPSHOT-DEBIAN" id="SNAPSHOT-DEBIAN">6.3.4.1. Debian GIT Snapshot</a></h4>
550 <p>For building just a git snapshot build the following workflow may be useful. First create a build
551 environment, for this you may have to run the following commands:</p>
552 <table border="0" bgcolor="#E0E0E0" width="100%">
555 <pre class="PROGRAMLISTING"> sudo apt install build-essential devscripts
556 sudo apt-get build-dep privoxy</pre>
560 <p>After this enter the checked out privoxy git tree and check that all (new) build dependencies are met:</p>
561 <table border="0" bgcolor="#E0E0E0" width="100%">
564 <pre class="PROGRAMLISTING"> dpkg-checkbuilddeps</pre>
568 <p>If something is missing, just add it using</p>
569 <table border="0" bgcolor="#E0E0E0" width="100%">
572 <pre class="PROGRAMLISTING"> sudo apt install foobar</pre>
576 <p>Now you may update debian/changelog, especially the version number using</p>
577 <table border="0" bgcolor="#E0E0E0" width="100%">
580 <pre class="PROGRAMLISTING"> dch</pre>
584 <p>and finally build the package:</p>
585 <table border="0" bgcolor="#E0E0E0" width="100%">
588 <pre class="PROGRAMLISTING"> debuild -us -uc -b</pre>
592 <p>If everything went okay, you may find the resulting Debian package in the parent directory.</p>
593 <p>You may want to clean up the build tree using</p>
594 <table border="0" bgcolor="#E0E0E0" width="100%">
597 <pre class="PROGRAMLISTING"> debian/rules clean</pre>
601 <p>And maybe repair some artefacts using one or both of the following commands:</p>
602 <table border="0" bgcolor="#E0E0E0" width="100%">
605 <pre class="PROGRAMLISTING"> git reset --hard
613 <h3 class="SECT3"><a name="NEWRELEASE-MACOSX" id="NEWRELEASE-MACOSX">6.3.5. macOS / OS X</a></h3>
614 <p>First, <span class="emphasis"><i class="EMPHASIS">make sure that you have freshly exported the right version
615 into an empty directory</i></span>. (See "Building and releasing packages" above).</p>
616 <p>The OSXPackageBuilder module generates OS X installer packages supporting all Macs running OS X 10.4 and
617 above. Obtain it from Git as follows into a folder parallel to the exported privoxy source:</p>
618 <table border="0" bgcolor="#E0E0E0" width="100%">
621 <pre class="PROGRAMLISTING"> git clone ssh://git@git.privoxy.org:23/git/OSXPackageBuilder.git</pre>
625 <p>The module contains complete instructions on its usage in the file <tt class="FILENAME">OS X Package Builder
627 <p>Once the package(s) have been generated, you can then upload them directly to the Files section of the
628 Sourceforge project in the Macintosh (OS X) folder. Each new version release of Privoxy should have a new
629 subfolder created in which to store its files. Please ensure that the folder contains a readme file that makes
630 it clear which package is for which version of OS X.</p>
633 <h3 class="SECT3"><a name="NEWRELEASE-FREEBSD" id="NEWRELEASE-FREEBSD">6.3.6. FreeBSD</a></h3>
634 <p>Update the www/privoxy port and submit a diff upstream. For details see the <a href=
635 "https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/" target="_top">FreeBSD Porter's
640 <h2 class="SECT2"><a name="RELEASING" id="RELEASING">6.4. Uploading and Releasing Your Package</a></h2>
641 <p>After the package is ready, it is time to upload it and go through the release steps. The upload is done at
642 <a href="https://sourceforge.net/projects/ijbswa/upload/" target="_top">SourceForge</a> after logging in.</p>
643 <p>Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly
644 uploaded packages in <span class="QUOTE">"Step 2. Add Files To This Release"</span>. Check the appropriate
645 box(es). Remember at each step to hit the <span class="QUOTE">"Refresh/Submit"</span> buttons! You should now see
646 your file(s) listed in Step 3. Fill out the forms with the appropriate information for your platform, being sure
647 to hit <span class="QUOTE">"Update"</span> for each file. If anyone is monitoring your platform, check the
648 <span class="QUOTE">"email"</span> box at the very bottom to notify them of the new package. This should do
650 <p>If you have made errors, or need to make changes, you can go through essentially the same steps, but select
651 <tt class="LITERAL">Edit Release</tt>, instead of <tt class="LITERAL">Add Release</tt>.</p>
654 <h2 class="SECT2"><a name="AFTERRELEASE" id="AFTERRELEASE">6.5. After the Release</a></h2>
655 <p>When all (or: most of the) packages have been uploaded and made available, send an email to the <a href=
656 "mailto:privoxy-announce@lists.privoxy.org" target="_top">announce mailing list</a>, Subject: "Announcing Privoxy
657 X.Y.Z $CODE_STATUS". Be sure to include the <a href="https://sourceforge.net/projects/ijbswa/files/" target=
658 "_top">download location</a>, the release notes and the Changelog. Also, post an updated News item on the project
659 page Sourceforge, and update the Home page and docs linked from the Home page (see below). Other news sites and
660 release oriented sites, such as Freshmeat, should also be notified.</p>
661 <p>Then update the source code for the next version to be released:</p>
664 <p>Increment the version number and change the code status to "UNRELEASED" in <tt class=
665 "FILENAME">configure.in</tt></p>
668 <p>Rebuild configure (<span class="QUOTE">"<b class="COMMAND">autoheader && autoconf</b>"</span>) and
669 GNUMakefile (<span class="QUOTE">"<b class="COMMAND">./configure</b>"</span>)</p>
672 <p><span class="QUOTE">"<b class="COMMAND">make dok-release</b>"</span> to update the sgml documentation
676 <p>Commit all your changes.</p>
681 <div class="NAVFOOTER">
682 <hr align="left" width="100%">
683 <table summary="Footer navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
685 <td width="33%" align="left" valign="top"><a href="testing.html" accesskey="P">Prev</a></td>
686 <td width="34%" align="center" valign="top"><a href="index.html" accesskey="H">Home</a></td>
687 <td width="33%" align="right" valign="top"><a href="webserver-update.html" accesskey="N">Next</a></td>
690 <td width="33%" align="left" valign="top">Testing Guidelines</td>
691 <td width="34%" align="center" valign="top"> </td>
692 <td width="33%" align="right" valign="top">Update the Webserver</td>