Updated the patch file with a slight modification for FreeBSD and Nginx Version # Support #2

Merged
merged 3 commits into from Mar 1, 2012

Conversation

Projects
None yet
2 participants
Contributor

Adalan commented Feb 27, 2012

I've installed this patch on 4 different boxes using Nginx 1.0.12 with success. I have to make a slight modification to get this to install via the ports tree.

Owner

yaoweibin commented Feb 28, 2012

Do you just change the patch pathing? I can't find any other differences
with the 1.0.6 patch.

It seems I can apply the 1.0.6 patch in my FreeBSD box directly. It
can't work with the ports?

On 2012/2/28 0:39, Adam Landry wrote:

I've installed this patch on 4 different boxes using Nginx 1.0.12 with success. I have to make a slight modification to get this to install via the ports tree.

You can merge this Pull Request by running:

git pull https://github.com/Adalan/nginx_syslog_patch master

Or you can view, comment on it, or merge it online at:

#2

-- Commit Summary --

  • Slight file changes for FreeBSD pathing
  • Updated file name to indicate support of 1.0.12
  • Removing old file

-- File Changes --

A freebsd_syslog_1.0.12.patch (690)

-- Patch Links --

https://github.com/yaoweibin/nginx_syslog_patch/pull/2.patch
https://github.com/yaoweibin/nginx_syslog_patch/pull/2.diff


Reply to this email directly or view it on GitHub:
#2

Contributor

Adalan commented Feb 28, 2012

All that was changed is the file path. Are you compiling from source when you apply the patch? When I include this file via the ports Makefile, without making the patch pathing, I get prompted for which files to patch. If I change the path, the file is patched without any intervention.

I can throw a doc up what changes I'm making to the Makefile as well as the location of the patch file if that helps make things clear.

Owner

yaoweibin commented Feb 28, 2012

Yes, I just apply the patch in the source code, not the ports Makefile.
It compiles OK.

You can show me you docs.

On 2012-2-28 19:28, Adam Landry wrote:

All that was changed is the file path. Are you compiling from source when you apply the patch? When I include this file via the ports Makefile, without making the patch pathing, I get prompted for which files to patch. If I change the path, the file is patched without any intervention.

I can throw a doc up what changes I'm making to the Makefile as well as the location of the patch file if that helps make things clear.


Reply to this email directly or view it on GitHub:
#2 (comment)

Contributor

Adalan commented Feb 29, 2012

In the current setup, I've been hijacking the existing syslog patch following this:

put your patch file here:

/usr/ports/www/nginx/files/extra-patch-syslog_support

edit /usr/ports/www/nginx/Makefile:
line 610: replace existing syslog definition with the following -

.if defined(WITH_SYSLOG_SUPPORT)
CONFIGURE_ARGS+=--add-module=/usr/home/csnuser/nginx_syslog_patch
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-syslog_support
.endif  

I then extract your module to

 /usr/home/csnuser/nginx_syslog_patch

I plan on making an update to the actual nginx port to support your patch / module, but that won't happen until after I've completed testing. Let me know if this is clear.

Owner

yaoweibin commented Mar 1, 2012

OK, If there is any problem in the testing, tell me. Thanks.

On 2012/3/1 3:18, Adam Landry wrote:

In the current setup, I've been hijacking the existing syslog patch following this:

put your patch file here: /usr/ports/www/nginx/files/extra-patch-syslog_support

edit /usr/ports/www/nginx/Makefile:
   line 610: replace existing syslog definition with the following -

        .if defined(WITH_SYSLOG_SUPPORT)
        CONFIGURE_ARGS+=--add-module=/usr/home/csnuser/nginx_syslog_patch
        EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-syslog_support
        .endif

I then extract your module to /usr/home/csnuser/nginx_syslog_patch

I plan on making an update to the actual nginx port to support your patch / module, but that won't happen until after I've completed testing. Let me know if this is clear.


Reply to this email directly or view it on GitHub:
#2 (comment)

Contributor

Adalan commented Mar 1, 2012

The only issue I've I had is the patch path (which is what this pull request is for)

yaoweibin added a commit that referenced this pull request Mar 1, 2012

Merge pull request #2 from Adalan/master
Updated the patch file with a slight modification for FreeBSD and Nginx Version 
Thanks to Adam Landry. See pull request:#2

@yaoweibin yaoweibin merged commit 256183b into yaoweibin:master Mar 1, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment