Add a wireshark-version:[] replacement and --sort-and-group-- block
definition to asciidoc.conf. Add support for asciidoc.conf to make-version.pl. Set some SVN keywords. Fill in the new protocol list. svn path=/trunk/; revision=48405
This commit is contained in:
Gerald Combs
parent
a46de56e38
commit
6bc16a77b0
|
|
@ -1,3 +1,10 @@
|
|||
# AsciiDoc configuration for Wireshark
|
||||
# $Id$
|
||||
|
||||
[replacements]
|
||||
|
||||
# Yes, this is a fake macro.
|
||||
wireshark-version:\[\]=1.9.2
|
||||
|
||||
[macros]
|
||||
|
||||
|
|
@ -33,3 +40,26 @@ ifdef::backend-html4,backend-html5,backend-xhtml11[]
|
|||
<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</a>
|
||||
|
||||
endif::backend-html4,backend-html5,backend-xhtml11[]
|
||||
|
||||
|
||||
# Given a list of items, sort and comma-separate them. Blank lines are stripped.
|
||||
# Case is ignored. For example,
|
||||
#
|
||||
# --sort-and-group--
|
||||
# One
|
||||
# two
|
||||
# red
|
||||
#
|
||||
# blue
|
||||
# Fish
|
||||
#
|
||||
# --sort-and-group--
|
||||
#
|
||||
# produces
|
||||
#
|
||||
# blue, Fish, One, red, two
|
||||
[blockdef-sort-and-group]
|
||||
delimiter=^--sort-and-group--$
|
||||
style=default
|
||||
filter=sort --ignore-case
|
||||
default-style=template="paragraph",filter='sort --ignore-case | sed -e "/^$/d" -e "$ s/^/and /" -e "$ ! s/$/,/"'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
= Wireshark 1.9.1 Release Notes
|
||||
= Wireshark wireshark-version:[] Release Notes
|
||||
// $Id$
|
||||
|
||||
== What is Wireshark?
|
||||
|
|
@ -31,6 +31,7 @@ and removal.
|
|||
* It is now possible to compare two fields in a display filter (for
|
||||
example: udp.srcport != udp.dstport). The two fields must be of the same
|
||||
type for this to work.
|
||||
* USB type and product name support has been improved.
|
||||
* The main welcome screen and status bar now display file sizes using
|
||||
strict SI prefixes instead of old-style binary prefixes.
|
||||
* Capinfos now prints human-readable statistics with SI suffixes by
|
||||
|
|
@ -38,7 +39,63 @@ default.
|
|||
|
||||
=== New Protocol Support
|
||||
|
||||
No new protocols
|
||||
--sort-and-group--
|
||||
|
||||
Amateur Radio BPQ
|
||||
Amateur Radio NET/ROM
|
||||
Amateur Radio AX.25
|
||||
America Online (AOL)
|
||||
AR Drone
|
||||
Automatic Position Reporting System (APRS)
|
||||
AX.25 KISS
|
||||
AX.25 no Layer 3
|
||||
Bitcoin Protocol
|
||||
Bluetooth Attribute Protocol
|
||||
Bluetooth AVDTP Protocol
|
||||
Bluetooth AVRCP Profile
|
||||
Bluetooth AVCTP Protocol
|
||||
Bluetooth BNEP Protocol
|
||||
Bluetooth HCI USB Transport
|
||||
Bluetooth HCRP Profile
|
||||
Bluetooth HID Profile
|
||||
Bluetooth MCAP Protocol
|
||||
Bluetooth SAP Profile
|
||||
Bluetooth SBC Codec
|
||||
Bluetooth Security Manager Protocol
|
||||
Cisco GED-125 Protocol
|
||||
Clique Reliable Multicast Protocol (CliqueRM)
|
||||
D-Bus
|
||||
Digital Transmission Content Protection over IP
|
||||
DVB-S2 Baseband
|
||||
FlexNet
|
||||
Forwarding and Control Element Separation Protocol (ForCES)
|
||||
Foundry Discovery Protocol (FDP)
|
||||
Gearman Protocol
|
||||
GEO-Mobile Radio (1) RACH
|
||||
HoneyPot Feeds Protocol (HPFEEDS)
|
||||
LTE Positioning Protocol Extensions (LLPe)
|
||||
Media Resource Control Protocol Version 2 (MRCPv2)
|
||||
MIDI System Exclusive (SYSEX)
|
||||
Media-Independent Handover (MIH)
|
||||
MPLS-TP Fault-Management
|
||||
MPLS-TP Lock-Instruct
|
||||
Mojito DHT
|
||||
OpenVPN Protocol
|
||||
Pseudo-Wire OAM
|
||||
RPKI-Router Protocol
|
||||
Skype
|
||||
SEL Fast Message
|
||||
Smart Message Language (SML)
|
||||
SPNEGO Extended Negotiation Security Mechanism (NEGOEX)
|
||||
Simple Packet Relay Transport (SPRT)
|
||||
USB Audio
|
||||
USB Video
|
||||
v.150.1 State Signaling Event (SSE)
|
||||
VNTAG
|
||||
WebRTC Datachannel Protocol (RTCDC)
|
||||
WiMAX OFDMA PHY SAP
|
||||
|
||||
--sort-and-group--
|
||||
|
||||
=== Updated Protocol Support
|
||||
|
||||
|
|
|
|||
|
|
@ -367,23 +367,23 @@ sub update_config_nmake
|
|||
print "$filepath has been updated.\n";
|
||||
}
|
||||
|
||||
# Read docbook/release_notes.xml, then write it back out with an updated
|
||||
# "WiresharkCurrentVersion" line.
|
||||
# Read docbook/asciidoc.conf, then write it back out with an updated
|
||||
# wireshark-version replacement line.
|
||||
sub update_release_notes
|
||||
{
|
||||
my $line;
|
||||
my $contents = "";
|
||||
my $version = "";
|
||||
my $filepath = "$srcdir/docbook/release-notes.xml";
|
||||
my $filepath = "$srcdir/docbook/asciidoc.conf";
|
||||
|
||||
return if (!$set_version);
|
||||
|
||||
open(RELNOTES, "< $filepath") || die "Can't read $filepath!";
|
||||
while ($line = <RELNOTES>) {
|
||||
# <!ENTITY WiresharkCurrentVersion "1.7.1">
|
||||
open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!";
|
||||
while ($line = <ADOC_CONF>) {
|
||||
# wireshark-version:\[\]=1.9.1
|
||||
|
||||
if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.*([\r\n]+)$/) {
|
||||
$line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\">$1",
|
||||
if ($line =~ /^wireshark-version:\\\[\\\]=.*([\r\n]+)$/) {
|
||||
$line = sprintf("wireshark-version:\\\[\\\]=%d.%d.%d$1",
|
||||
$version_pref{"version_major"},
|
||||
$version_pref{"version_minor"},
|
||||
$version_pref{"version_micro"},
|
||||
|
|
@ -392,9 +392,9 @@ sub update_release_notes
|
|||
$contents .= $line
|
||||
}
|
||||
|
||||
open(RELNOTES, "> $filepath") || die "Can't write $filepath!";
|
||||
print(RELNOTES $contents);
|
||||
close(RELNOTES);
|
||||
open(ADOC_CONF, "> $filepath") || die "Can't write $filepath!";
|
||||
print(ADOC_CONF $contents);
|
||||
close(ADOC_CONF);
|
||||
print "$filepath has been updated.\n";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue